* Drop source-compatibility with Debian 3.0:

  - Remove support for building with GNOME 1. This allows simplification
    of our GNOME build-dependencies (see #460136).
  - Remove hacks to support the old PAM configuration scheme.
  - Remove compatibility for building without po-debconf.
* Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I
  can see, the GTK2 version of ssh-askpass-gnome has never required
  libgnomeui-dev.

30 files changed, 548 insertions, 491 deletions

diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index a45424a6b..c619f3451 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] openssh-server.templates.master
+[type: gettext/rfc822deb] openssh-server.templates
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 9932205d1..9b61479fd 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-24 11:29+0300\n"
 "Last-Translator: Damyan Ivanov <dam@modsoftsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Създаване на нов файл с настройки за OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -39,7 +39,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -60,13 +60,13 @@ msgstr "Препоръчва се да изберете създаването �
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Да се прекъснат ли текущите връзки по SSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -78,7 +78,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -88,13 +88,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Необходим е нов ключ за хоста"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -107,19 +107,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Необходимо е да се генерира ръчно нов ключ за хоста."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Забрана на удостоверяването challenge-response?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -137,7 +137,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 841efeaf7..d97d86a5e 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1:4.6p1-2\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-06-30 01:13+0200\n"
 "Last-Translator: Jordà Polo <jorda@ettin.org>\n"
 "Language-Team: Català <debian-l10n-catalan@lists.debian.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Voleu generar un nou fitxer de configuració per a l'OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -66,13 +66,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Voleu arriscar-vos a aturar les sessions SSH actives?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -85,23 +85,23 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
 msgstr ""
-"Ho podeu arreglar afegint «--pidfile /var/run/sshd.pid» a la línia «start-"
-"stop-daemon» de la secció «stop» del mateix fitxer."
+"Ho podeu arreglar afegint «--pidfile /var/run/sshd.pid» a la línia «start-stop-"
+"daemon» de la secció «stop» del mateix fitxer."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Nova clau obligatòria"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -114,19 +114,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Haureu de generar manualment una nova clau per a la màquina."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Voleu desactivar l'autenticació «challenge-response»?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -145,7 +145,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 9c6a397bf..d54865908 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-30 10:22+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Vytvořit nový konfigurační soubor OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -69,13 +69,13 @@ msgstr "Je vřele doporučeno nechat si nyní vytvořit nový konfigurační sou
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Chcete riskovat ukončení aktivních SSH spojení?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -97,13 +97,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Nutný nový serverový klíč"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -116,19 +116,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Musíte ručně vygenerovat nový serverový klíč"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Zakázat autentizaci challenge-response?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -145,7 +145,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/da.po b/debian/po/da.po
index 70787bcb1..e4cf83edb 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.8.1p1\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2006-10-02 08:53+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -27,7 +27,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid "Generate new configuration file?"
 msgid "Generate a new configuration file for OpenSSH?"
@@ -35,7 +35,7 @@ msgstr "Gener�r ny ops�tningsfil?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "This version of OpenSSH has a considerably changed configuration file "
@@ -58,7 +58,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please note that this new configuration file will set the value of "
@@ -80,7 +80,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "It is strongly recommended that you let this package generate a new "
@@ -93,7 +93,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgid "Do you want to risk killing active SSH sessions?"
@@ -101,7 +101,7 @@ msgstr "Vil du forts�tte (og risikere at afbryde aktive ssh-forbindelser)?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The version of /etc/init.d/ssh that you have installed, is likely to kill "
@@ -118,7 +118,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-"
@@ -132,13 +132,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid ""
 #| "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH "
@@ -156,7 +156,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid "You will need to generate a new host key."
 msgid "You need to manually generate a new host key."
@@ -164,13 +164,13 @@ msgstr "Du skal oprette en ny v�rtsn�gle."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Sl� udfordrings-svar godkendelse fra?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Password authentication appears to be disabled in your current OpenSSH "
@@ -195,7 +195,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/de.po b/debian/po/de.po
index a1eea116f..6e65ec634 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 1:4.3p2-11\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-24 14:42+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Eine neue Konfigurationsdatei f�r OpenSSH erzeugen?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -31,15 +31,14 @@ msgid ""
 "any customizations you made with the old version."
 msgstr ""
 "Diese Version von OpenSSH hat eine deutlich ge�nderte Konfigurationsdatei "
-"gegen�ber der in �Potato� ausgelieferten Version, von der Sie anscheinend "
-"ein Upgrade durchf�hren. Dieses Paket kann jetzt eine neue "
-"Konfigurationsdatei (/etc/ssh/sshd.config) erzeugen, die mit der neuen "
-"Server-Version zusammenarbeitet, aber keine Anpassungen aus der alten "
-"Version enth�lt."
+"gegen�ber der in �Potato� ausgelieferten Version, von der Sie anscheinend ein "
+"Upgrade durchf�hren. Dieses Paket kann jetzt eine neue Konfigurationsdatei (/"
+"etc/ssh/sshd.config) erzeugen, die mit der neuen Server-Version "
+"zusammenarbeitet, aber keine Anpassungen aus der alten Version enth�lt."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -53,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -63,13 +62,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Wollen Sie das Beenden aktiver SSH-Sitzungen riskieren?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -82,24 +81,24 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
 msgstr ""
 "Dieses Problem kann behoben werden, indem �--pidfile /var/run/sshd.pid� an "
-"die start-stop-daemon-Zeile in dem Abschnitt �stop� der Datei /etc/init.d/"
-"ssh manuell hinzugef�gt wird."
+"die start-stop-daemon-Zeile in dem Abschnitt �stop� der Datei /etc/init.d/ssh "
+"manuell hinzugef�gt wird."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Neuer Host-Schl�ssel verpflichtend"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -113,19 +112,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Sie m�ssen manuell einen neuen Host-Schl�ssel erzeugen."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Challenge-response-Authentifizierung deaktivieren?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -144,7 +143,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/el.po b/debian/po/el.po
index 478699dbe..7000dfb40 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2004-10-14 21:34+0300\n"
 "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -27,14 +27,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Δημιουργία νέου αρχείου ρυθμίσεων"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
@@ -53,7 +53,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please note that this new configuration file will set the value of "
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
@@ -85,7 +85,7 @@ msgstr "Συνιστάται να επιλέξετε την δημιουργία
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgid "Do you want to risk killing active SSH sessions?"
@@ -94,7 +94,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The version of /etc/init.d/ssh that you have installed, is likely to kill "
@@ -111,7 +111,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-"
@@ -125,13 +125,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
@@ -146,7 +146,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid "You will need to generate a new host key."
 msgid "You need to manually generate a new host key."
@@ -154,13 +154,13 @@ msgstr "Πρέπει να δημιουργήσετε ένα νέο κλειδί
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Να απενεργοποιηθεί η πιστοποίηση challenge-response;"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Password authentication appears to be disabled in your current OpenSSH "
@@ -186,7 +186,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/es.po b/debian/po/es.po
index 3258973ee..d1ad47a3c 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -32,8 +32,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-11\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-23 21:54+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino Pe�a <jfs@computer.org>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -43,13 +43,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "�Desea generar un nuevo fichero de configuraci�n para OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -80,7 +80,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -90,13 +90,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "�Desea correr el riesgo de matar las sesiones SSH activas?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -109,7 +109,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -119,13 +119,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Nueva clave de sistema obligatoria"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -134,24 +134,24 @@ msgid ""
 msgstr ""
 "La clave actual de su sistema, en /etc/ssh/ssh_host_key, est� cifrada con el "
 "algoritmo IDEA. OpenSSH no puede manejar este fichero de clave y tampoco "
-"parece estar disponible la utilidad �ssh-keygen� de la instalaci�n antigua "
-"de SSH (no libre)."
+"parece estar disponible la utilidad �ssh-keygen� de la instalaci�n antigua de "
+"SSH (no libre)."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Debe generar manualmente una nueva clave de sistema."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "�Desea deshabilitar la autenticaci�n basada en desaf�o-respuesta?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -170,7 +170,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
@@ -341,9 +341,9 @@ msgstr ""
 #~ "sshd_config after the upgrade is complete, taking note of the warning in "
 #~ "the sshd_config(5) manual page."
 #~ msgstr ""
-#~ "Para volver a activar esta opci�n, escriba �PermitUserEnvironment yes� "
-#~ "en /etc/ssh/sshd_config al terminar la actualizaci�n, teniendo en cuenta "
-#~ "el aviso de la p�gina de manual de sshd_config(5)."
+#~ "Para volver a activar esta opci�n, escriba �PermitUserEnvironment yes� en /"
+#~ "etc/ssh/sshd_config al terminar la actualizaci�n, teniendo en cuenta el "
+#~ "aviso de la p�gina de manual de sshd_config(5)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Separaci�n de privilegios"
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 3bed0c515..058d19b6a 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh-templates\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-27 12:10+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "OpenSSH-rentzat konfigurazio fitxategi berri bat sortu?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -42,7 +42,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -56,7 +56,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -64,13 +64,13 @@ msgstr "Gomendagarria da konfigurazio fitxategi berri bat orain sortzea."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Irekirik dauden SSH saioak ixteko arriskua artu nahi duzu?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -83,7 +83,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -93,13 +93,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Ostalari gako berria beharrezkoa"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -113,19 +113,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Ostalari gako berri bat eskuz sortu behar duzu."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "erronka-erantzun autentifikazioa ezgaitu?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -143,7 +143,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 58cf74e2d..8dd597ea4 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2005-04-08 22:15+0300\n"
 "Last-Translator: Matti Pöllä <mpo@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -28,14 +28,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Luo uusi asetustiedosto"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please note that this new configuration file will set the value of "
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
@@ -86,7 +86,7 @@ msgstr "Uuden asetustiedoston luominen on erittäin suositeltavaa."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgid "Do you want to risk killing active SSH sessions?"
@@ -94,7 +94,7 @@ msgstr "Haluatko jatkaa (ja mahdollisesti lopettaa aktiiviset ssh-istunnot)?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The version of /etc/init.d/ssh that you have installed, is likely to kill "
@@ -113,7 +113,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-"
@@ -127,13 +127,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
@@ -148,7 +148,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid "You will need to generate a new host key."
 msgid "You need to manually generate a new host key."
@@ -156,13 +156,13 @@ msgstr "Uuden konekohtaisen avaimen (host key) luominen on tarpeen."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Poista käytöstä haaste-vaste -autentikointi"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Password authentication appears to be disabled in your current OpenSSH "
@@ -188,7 +188,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index aa5c1ff99..86ace6fc1 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-23 18:05+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -28,13 +28,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Faut-il créer un nouveau fichier de configuration pour OpenSSH ?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -75,13 +75,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Voulez-vous risquer de rompre les sessions SSH actives ?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -94,24 +94,24 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
 msgstr ""
-"Cela peut être corrigé en ajoutant « --pidfile /var/run/sshd.pid » à la "
-"ligne « start-stop-daemon » dans /etc/init.d/ssh, dans la section « stop » "
-"du fichier."
+"Cela peut être corrigé en ajoutant « --pidfile /var/run/sshd.pid » à la ligne "
+"« start-stop-daemon » dans /etc/init.d/ssh, dans la section « stop » du "
+"fichier."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Nouvelle clé d'hôte obligatoire"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -124,19 +124,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Vous devez générer une nouvelle clé d'hôte vous-même."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Faut-il désactiver l'authentification par défi-réponse ?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -155,7 +155,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 1168c0264..95fa5c4bf 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-24 18:09+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "¿Xerar un novo ficheiro de configuración para OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -45,7 +45,7 @@ msgstr ""
 # | "details about this design choice."
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -69,13 +69,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "¿Quere arriscarse a matar as sesións de SSH activas?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -98,13 +98,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "É obrigatorio ter unha nova clave de servidor"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -118,19 +118,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Ten que xerar unha nova clave de servidor."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "¿Desactivar a autenticación por desafío-resposta?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -149,7 +149,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/it.po b/debian/po/it.po
index e5b3d3740..c0bc11a13 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 4.3p2 italian debconf templates\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-25 11:08+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Generare un nuovo file di configurazione per OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -41,7 +41,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -49,13 +49,13 @@ msgid ""
 "details about this design choice."
 msgstr ""
 "Notare che nel nuovo file di configurazione il valore di «PermitRootLogin» è "
-"impostato a «yes» (quindi chiunque conosca la password di root può "
-"collegarsi tramite ssh direttamente come root). Per ulteriori dettagli su "
-"questa scelta si veda il file README.Debian."
+"impostato a «yes» (quindi chiunque conosca la password di root può collegarsi "
+"tramite ssh direttamente come root). Per ulteriori dettagli su questa scelta "
+"si veda il file README.Debian."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -65,13 +65,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Si vuole rischiare di terminare le sessioni SSH attive?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -84,23 +84,23 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
 msgstr ""
-"È possibile evitare ciò aggiungendo manualmente «--pidfile /var/run/sshd."
-"pid» alla riga start-stop-daemon nella sezione stop del file."
+"È possibile evitare ciò aggiungendo manualmente «--pidfile /var/run/sshd.pid» "
+"alla riga start-stop-daemon nella sezione stop del file."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Necessaria una nuova chiave host"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -114,19 +114,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "È necessario generare manualmente una nuova chiave host."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Disabilitare l'autenticazione interattiva?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -145,7 +145,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index c448de9d4..17a179df1 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-25 21:52+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "OpenSSH の新しい設定ファイルを作りますか?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -69,13 +69,13 @@ msgstr "新しい設定ファイルを今生成することを強くお勧めし
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "接続中の SSH セッションが切れるかもしれませんがよいですか?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -97,13 +97,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "新しいホストキーが必要です"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -116,19 +116,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "新しいホストキーを手動で生成する必要があります。"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "チャレンジ-レスポンス認証を無効にしますか?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -145,7 +145,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/ko.po b/debian/po/ko.po
index f5a213ccc..fcd374cda 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-05-15 19:28+0900\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "OpenSSH 설정 파일을 새로 만들까요?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -62,13 +62,13 @@ msgstr "설정 파일을 지금 새로 만드시길 강력히 권장합니다."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "현재 사용중인 SSH 세션을 죽여도 괜찮습니까?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -80,7 +80,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -90,13 +90,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "호스트키 새로 만들어야 함"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -109,19 +109,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "호스트키를 직접 새로 생성하셔야 합니다."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "제기-응답 인증방식을 해제하도록 할까요?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -137,7 +137,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/nb.po b/debian/po/nb.po
index d1f645cfb..fcd094002 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-24 19:14+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Skal ny oppsettsfil for OpenSSH lages?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -53,7 +53,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -62,13 +62,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Vil du risikere å avbryte aktive SSH-økter?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -80,23 +80,23 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
 msgstr ""
-"Dette kan rettes på ved å legge til manuelt «--pidfile /var/run/sshd.pid» "
-"til start-stop-daemon linja i stopp-delen av fila."
+"Dette kan rettes på ved å legge til manuelt «--pidfile /var/run/sshd.pid» til "
+"start-stop-daemon linja i stopp-delen av fila."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Ny vertsnøkkel obligatorisk"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -110,19 +110,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "En ny vertsnøkkel må lages manuelt."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Skal autentisering med utfordring/svar slås av?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -140,7 +140,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 5fc800347..b3073f4d8 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-9\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-28 20:40+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -26,14 +26,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr ""
 "Wilt u dat er een nieuw configuratiebestand aangemaakt wordt voor OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -74,13 +74,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Wilt u het afsluiten van actieve SSH-sessies riskeren?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -93,7 +93,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -103,13 +103,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Een nieuwe computersleutel is verplicht"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -123,19 +123,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "U dient bijgevolg handmatig een nieuwe computersleutel te genereren."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Challenge-response-authenticatie deactiveren?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -153,7 +153,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/pl.po b/debian/po/pl.po
index b8d7d2b7c..fdb2cf172 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2004-04-08 18:28+0200\n"
 "Last-Translator: Emil Nowak <emil5@go2.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -25,14 +25,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Wygeneruj nowy plik konfiguracyjny"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
@@ -49,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please note that this new configuration file will set the value of "
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
@@ -82,7 +82,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgid "Do you want to risk killing active SSH sessions?"
@@ -90,7 +90,7 @@ msgstr "Czy chcesz kontynuowa� (i ryzykowa� przerwaniem aktywnych sesji ssh) ?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The version of /etc/init.d/ssh that you have installed, is likely to kill "
@@ -107,7 +107,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-"
@@ -121,13 +121,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
@@ -141,7 +141,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid "You will need to generate a new host key."
 msgid "You need to manually generate a new host key."
@@ -149,13 +149,13 @@ msgstr "B�dziesz musia� wygenerowa� nowy klucz hosta."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -167,7 +167,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 40ee3f945..93ccb93f3 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 4.3p2-3\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-05-09 22:21+0100\n"
 "Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
 "Language-Team: Native Portuguese <traduz@debianpt.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Gerar um ficheiro de configuração novo para o OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -62,13 +62,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Quer arriscar matar sessões activas de SSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -81,7 +81,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -91,13 +91,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Uma nova chave de anfitrião é obrigatória"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -110,19 +110,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Terá de gerar manualmente uma nova chave para o host."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Desactivar autenticação por desafio-resposta?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -140,7 +140,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 9d684e11e..1f1adb1f3 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -5,26 +5,27 @@
 # Eder L. Marques <frolic@debian-ce.org>, 2007.
 #
 msgid ""
-msgstr "pt_BR utf-8\n"
+msgstr ""
 "Project-Id-Version: openssh_1:4.6p1-5\n"
-"Report-Msgid-Bugs-To: matthew@debian.org\n"
-"POT-Creation-Date: 2007-04-24 16:48+0200\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-08-25 23:24-0300\n"
 "Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
 "Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Gerar um novo arquivo de configuração para o OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -33,15 +34,15 @@ msgid ""
 "any customizations you made with the old version."
 msgstr ""
 "Esta versão do OpenSSH possui um arquivo de configuração consideravelmente "
-"diferente da versão fornecida com o Debian 'Potato', a versão do Debian "
-"a partir da qual você parece estar atualizando. Este pacote pode agora gerar "
+"diferente da versão fornecida com o Debian 'Potato', a versão do Debian a "
+"partir da qual você parece estar atualizando. Este pacote pode agora gerar "
 "um novo arquivo de configuração (/etc/ssh/sshd_config), o qual irá funcionar "
 "com a nova versão do servidor sshd mas não irá conter nenhuma personalização "
 "que você possa ter feito na versão anterior."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -49,14 +50,14 @@ msgid ""
 "details about this design choice."
 msgstr ""
 "Por favor, note que este novo arquivo de configuração irá definir o valor da "
-"opção 'PermitRootLogin' para 'yes' (o que significa que qualquer pessoa "
-"que conheça a senha do root poderá conectar via ssh diretamente como root). "
-"Por favor, leia os arquivos README.Debian para maiores detalhes sobre essa "
+"opção 'PermitRootLogin' para 'yes' (o que significa que qualquer pessoa que "
+"conheça a senha do root poderá conectar via ssh diretamente como root). Por "
+"favor, leia os arquivos README.Debian para maiores detalhes sobre essa "
 "escolha de design."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -66,13 +67,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Você deseja arriscar matar (\"kill\") as sessões SSH ativas?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -85,7 +86,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -95,13 +96,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Nova chave de máquina obrigatória"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -113,22 +114,21 @@ msgstr ""
 "chave de máquina, e o utilitário ssh-keygen da antiga (e não livre) "
 "instalação SSH não parece estar disponível."
 
-
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Você precisa gerar manualmente uma chave de máquina."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:5001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Desabilitar autenticação desafio-resposta (\"challenge-response\")?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:5001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -147,16 +147,16 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:5001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
 "answer), then the 'PasswordAuthentication no' option will have no useful "
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
-"Caso você desabilite a autenticação desafio-resposta "
-"(\"challenge-response\"), os usuários não poderão se autenticar utilizando "
-"suas senhas. Se você deixá-la habilitada (a resposta padrão), então a opção "
+"Caso você desabilite a autenticação desafio-resposta (\"challenge-response"
+"\"), os usuários não poderão se autenticar utilizando suas senhas. Se você "
+"deixá-la habilitada (a resposta padrão), então a opção "
 "'PasswordAuthentication no' não terá efeito útil a menos que você também "
 "ajuste sua configuração PAM em /etc/pam.d/ssh."
 
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 8d03a09b1..d852d7798 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 1.4\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-05-01 05:45+0300\n"
 "Last-Translator: Igor Stirbu <igor.stirbu@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Să se genereze un fișier nou de configurare pentru OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -68,13 +68,13 @@ msgstr "Este indicat să alegeți acum generarea un nou fișier de configurare."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Doriți să riscați întreruperea sesiunilor ssh active?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -97,13 +97,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "O cheie nouă este obligatorie"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -116,19 +116,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Va trebui să generați manual o nouă cheie pentru sistem."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Dezactivează modul de autentificare provocare-răspuns?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -146,7 +146,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 5c5540f88..fd5fea6e8 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh_ru\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-05-08 12:11+0300\n"
 "Last-Translator: Yuriy Talakan' <yt@drsk.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -28,13 +28,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Создать новый файл настроек для OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -73,13 +73,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Вы хотите пойти на риск потерять активные SSH соединения?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -92,7 +92,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -102,13 +102,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Необходим новый хост-ключ"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -122,19 +122,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Вам нужно вручную создать новый хост-ключ."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Отключить аутентификацию запрос-ответ?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -152,7 +152,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 5cd4eaace..ca07dc29a 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 1_4.6p1-5\n"
-"Report-Msgid-Bugs-To: matthew@debian.org\n"
-"POT-Creation-Date: 2007-04-24 16:48+0200\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-09-10 22:15+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -12,79 +12,137 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Vytvoriť nový konfiguračný súbor pre OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
-msgid "This version of OpenSSH has a considerably changed configuration file from the version shipped in Debian 'Potato', which you appear to be upgrading from. This package can now generate a new configuration file (/etc/ssh/sshd.config), which will work with the new server version, but will not contain any customizations you made with the old version."
-msgstr "Táto verzia OpenSSH má podstatne zmenený konfiguračný súbor v porovnaní s versiou, ktorá sa dodávala s Debian „Potato“, z ktorej, zdá sa, aktualizujete. Tento balík teraz môže vytvoriť nový konfiguračný súbor (/etc/ssh/sshd.config), ktorý bude fungovať s novou verziou servera, ale nebude obsahovať akékoľvek zmeny, ktoré ste urobili v starej verzii."
+#: ../openssh-server.templates:1001
+msgid ""
+"This version of OpenSSH has a considerably changed configuration file from "
+"the version shipped in Debian 'Potato', which you appear to be upgrading "
+"from. This package can now generate a new configuration file (/etc/ssh/sshd."
+"config), which will work with the new server version, but will not contain "
+"any customizations you made with the old version."
+msgstr ""
+"Táto verzia OpenSSH má podstatne zmenený konfiguračný súbor v porovnaní s "
+"versiou, ktorá sa dodávala s Debian „Potato“, z ktorej, zdá sa, "
+"aktualizujete. Tento balík teraz môže vytvoriť nový konfiguračný súbor (/etc/"
+"ssh/sshd.config), ktorý bude fungovať s novou verziou servera, ale nebude "
+"obsahovať akékoľvek zmeny, ktoré ste urobili v starej verzii."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
-msgid "Please note that this new configuration file will set the value of 'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password can ssh directly in as root). Please read the README.Debian file for more details about this design choice."
-msgstr "Prosím, majte na pamäti, že tento nový konfiguračný súbor nastaví hodnotu „'PermitRootLogin“ na „áno“ (čo znamená, že každý, kto pozná heslo účtu root, sa bude môcť pomocou ssh prihlásiť priamo ako root). Prosím, prečítajte si podrobnosti o tejto voľbe pri návrhu v súbore README.Debian."
+#: ../openssh-server.templates:1001
+msgid ""
+"Please note that this new configuration file will set the value of "
+"'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
+"can ssh directly in as root). Please read the README.Debian file for more "
+"details about this design choice."
+msgstr ""
+"Prosím, majte na pamäti, že tento nový konfiguračný súbor nastaví hodnotu "
+"„'PermitRootLogin“ na „áno“ (čo znamená, že každý, kto pozná heslo účtu "
+"root, sa bude môcť pomocou ssh prihlásiť priamo ako root). Prosím, "
+"prečítajte si podrobnosti o tejto voľbe pri návrhu v súbore README.Debian."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
-msgid "It is strongly recommended that you choose to generate a new configuration file now."
-msgstr "Silne sa odporúča, aby ste teraz zvolili vytvorenie nového konfiguračného súboru."
+#: ../openssh-server.templates:1001
+msgid ""
+"It is strongly recommended that you choose to generate a new configuration "
+"file now."
+msgstr ""
+"Silne sa odporúča, aby ste teraz zvolili vytvorenie nového konfiguračného "
+"súboru."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Chcete riskovať zrušenie aktívnych SSH relácií?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:3001
-msgid "The currently installed version of /etc/init.d/ssh is likely to kill all running sshd instances. If you are doing this upgrade via an SSH session, you're likely to be disconnected and leave the upgrade procedure unfinished."
-msgstr "Momentálne nainštalovaná verzia /etc/init.d/ssh pravdepodobne ukončí všetky prebiehajúce inštancie sshd. Ak túto aktualizáciu vykonávate cez reláciu SSH pravdepodobne budete odpojený a aktualizácia zostane nedokončená."
+#: ../openssh-server.templates:2001
+msgid ""
+"The currently installed version of /etc/init.d/ssh is likely to kill all "
+"running sshd instances. If you are doing this upgrade via an SSH session, "
+"you're likely to be disconnected and leave the upgrade procedure unfinished."
+msgstr ""
+"Momentálne nainštalovaná verzia /etc/init.d/ssh pravdepodobne ukončí všetky "
+"prebiehajúce inštancie sshd. Ak túto aktualizáciu vykonávate cez reláciu SSH "
+"pravdepodobne budete odpojený a aktualizácia zostane nedokončená."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:3001
-msgid "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the start-stop-daemon line in the stop section of the file."
-msgstr "Toto je možné manuálne napraviť tým, že pridáte „--pidfile /var/run/sshd.pid“ do stop sekcie súboru start-stop-daemon."
+#: ../openssh-server.templates:2001
+msgid ""
+"This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
+"start-stop-daemon line in the stop section of the file."
+msgstr ""
+"Toto je možné manuálne napraviť tým, že pridáte „--pidfile /var/run/sshd."
+"pid“ do stop sekcie súboru start-stop-daemon."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Nový kľúč hostiteľa je povinný"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:4001
-msgid "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA algorithm. OpenSSH can not handle this host key file, and the ssh-keygen utility from the old (non-free) SSH installation does not appear to be available."
-msgstr "Aktuálny kľúč hostiteľa v /etc/ssh/ssh_host_key je kryptovaný algoritmom IDEA. OpenSSH nemôže pracovať s týmto súborom s kľúčom hostiteľa a nástroj ssh-keygen zo starej (neslobodnej) inštalácie SSH nie je dostupný."
+#: ../openssh-server.templates:3001
+msgid ""
+"The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
+"algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
+"utility from the old (non-free) SSH installation does not appear to be "
+"available."
+msgstr ""
+"Aktuálny kľúč hostiteľa v /etc/ssh/ssh_host_key je kryptovaný algoritmom "
+"IDEA. OpenSSH nemôže pracovať s týmto súborom s kľúčom hostiteľa a nástroj "
+"ssh-keygen zo starej (neslobodnej) inštalácie SSH nie je dostupný."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Musíte ručne vygenerovať nový kľúč hostiteľa."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:5001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Vypnúť autentifikáciu výzva-odpoveď?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:5001
-msgid "Password authentication appears to be disabled in the current OpenSSH server configuration. In order to prevent users from logging in using passwords (perhaps using only public key authentication instead) with recent versions of OpenSSH, you must disable challenge-response authentication, or else ensure that your PAM configuration does not allow Unix password file authentication."
-msgstr "Zdá sa, že autentifikácia pomocou hesla je v aktuálnej konfigurácii OpenSSH servera vypnutá. Aby ste zabránili používateľom prihlasovať sa pomocou hesiel (snáď iba použitím autentifikácie svojím verejným kľúčom) pri novších verziách OpenSSH musíte vypnúť autentifikáciu výzva-odpoveď alebo sa inak uistiť, že vaša konfigurácia PAM neumožňuje autentifikáciu pomocu unixového súboru s heslami."
+#: ../openssh-server.templates:4001
+msgid ""
+"Password authentication appears to be disabled in the current OpenSSH server "
+"configuration. In order to prevent users from logging in using passwords "
+"(perhaps using only public key authentication instead) with recent versions "
+"of OpenSSH, you must disable challenge-response authentication, or else "
+"ensure that your PAM configuration does not allow Unix password file "
+"authentication."
+msgstr ""
+"Zdá sa, že autentifikácia pomocou hesla je v aktuálnej konfigurácii OpenSSH "
+"servera vypnutá. Aby ste zabránili používateľom prihlasovať sa pomocou "
+"hesiel (snáď iba použitím autentifikácie svojím verejným kľúčom) pri novších "
+"verziách OpenSSH musíte vypnúť autentifikáciu výzva-odpoveď alebo sa inak "
+"uistiť, že vaša konfigurácia PAM neumožňuje autentifikáciu pomocu unixového "
+"súboru s heslami."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:5001
-msgid "If you disable challenge-response authentication, then users will not be able to log in using passwords. If you leave it enabled (the default answer), then the 'PasswordAuthentication no' option will have no useful effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
-msgstr "Ak vypnete autentifikáciu výzva-odpoveď, používatelia sa nebudú môcť prihlasovať pomocou hesiel. Ak ju necháte zapnutú (štandardná odpoveď), potom nebude mať voľba „PasswordAuthentication no“ žiadny účinok v prípade, že tiež vhodne nenastavíte vašu konfiguráciu PAM v /etc/pam.d/ssh."
-
+#: ../openssh-server.templates:4001
+msgid ""
+"If you disable challenge-response authentication, then users will not be "
+"able to log in using passwords. If you leave it enabled (the default "
+"answer), then the 'PasswordAuthentication no' option will have no useful "
+"effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
+msgstr ""
+"Ak vypnete autentifikáciu výzva-odpoveď, používatelia sa nebudú môcť "
+"prihlasovať pomocou hesiel. Ak ju necháte zapnutú (štandardná odpoveď), "
+"potom nebude mať voľba „PasswordAuthentication no“ žiadny účinok v prípade, "
+"že tiež vhodne nenastavíte vašu konfiguráciu PAM v /etc/pam.d/ssh."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 6afd25016..6caecd411 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 1:4.3p2-1\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-26 15:55+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -24,13 +24,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Generera en ny konfigurationsfil f�r OpenSSH?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -71,13 +71,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Vill du riskera att d�da aktiva SSH-sessioner?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -90,7 +90,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -100,13 +100,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Ny v�rdnyckel �r obligatorisk"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -120,19 +120,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Du beh�ver manuellt generera en ny v�rdnyckel."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Inaktivera challenge-response-autentisering?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -150,7 +150,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/ta.po b/debian/po/ta.po
index 256ac3907..49e04d403 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-04-24 20:52+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "ஓபன் எஸ்எஸ்ஹெச் க்கு புதிய வடிவமைப்பு கோப்பை உருவாக்கவா?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -39,7 +39,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -62,14 +62,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr ""
 "செயலில் இருக்கும் எஸ்எஸ்ஹெச் அமர்வுகளை செயல் நீக்கம் செய்வதை அனுமதிக்க விரும்புகிறீகளா?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -81,7 +81,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -91,13 +91,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "புதிய புரவலன் விசை கட்டாயமாகும்"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -110,19 +110,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "நீங்கள் கைமுறையாக புதிய புரவலன் விசையை உருவாக்க வேண்டும்."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "கேள்வி பதில் உறுதிப்படுத்தலை செயலிழக்க செய்யவா?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -139,7 +139,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 0f9b18e3f..44cb96d15 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -35,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -45,7 +45,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -53,13 +53,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
@@ -76,13 +76,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -92,19 +92,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -116,7 +116,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 89ba26a31..7b8a63445 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ssh\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2004-04-27 06:50+0300\n"
 "Last-Translator: Recai Oktaş <roktas@omu.edu.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -17,14 +17,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Yeni yapılandırma dosyası oluştur"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
@@ -41,7 +41,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please note that this new configuration file will set the value of "
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgid "Do you want to risk killing active SSH sessions?"
@@ -83,7 +83,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The version of /etc/init.d/ssh that you have installed, is likely to kill "
@@ -100,7 +100,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-"
@@ -114,13 +114,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
@@ -134,7 +134,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid "You will need to generate a new host key."
 msgid "You need to manually generate a new host key."
@@ -142,13 +142,13 @@ msgstr "Yeni bir makine anahtarı oluşturmanız gerekiyor."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -160,7 +160,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 10ec31bd9..212d595b5 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh-uk\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2005-03-28 22:28+0300\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -28,14 +28,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Створити новий файл налаштувань"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please note that this new configuration file will set the value of "
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
@@ -84,7 +84,7 @@ msgstr "Рекомендується дозволити створити нов�
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgid "Do you want to risk killing active SSH sessions?"
@@ -93,7 +93,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The version of /etc/init.d/ssh that you have installed, is likely to kill "
@@ -109,7 +109,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-"
@@ -123,13 +123,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
@@ -143,7 +143,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid "You will need to generate a new host key."
 msgid "You need to manually generate a new host key."
@@ -151,13 +151,13 @@ msgstr "Вам потрібно створити новий ключ вузла.
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Заборонити автентифікацію запит-відповідь?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Password authentication appears to be disabled in your current OpenSSH "
@@ -183,7 +183,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 311fe6db4..fcf3a9996 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese translation for openssh.
 # Copyright © 2007 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 1/4.1p1-4\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2007-06-10 14:47+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "Tao ra tập tin cấu hình mới cho OpenSSH không?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -46,7 +46,7 @@ msgstr ""
 # can always edit sshd_config and set it to no if you wish.
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to 'yes' (meaning that anyone knowing the root password "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
 "file now."
@@ -69,7 +69,7 @@ msgstr "Rất khuyên bạn chọn tạo ra tập tin cấu hình mới ngay bâ
 # msgid "Do you want to continue (and risk killing active ssh sessions)?"
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid "Do you want to risk killing active SSH sessions?"
 msgstr "Bạn có muốn rủi ro giết phiên bản SSH còn hoạt động không?"
 
@@ -79,7 +79,7 @@ msgstr "Bạn có muốn rủi ro giết phiên bản SSH còn hoạt động kh
 # session, that would be a Bad Thing(tm).
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "The currently installed version of /etc/init.d/ssh is likely to kill all "
 "running sshd instances. If you are doing this upgrade via an SSH session, "
@@ -94,24 +94,24 @@ msgstr ""
 # stop-daemon line in the stop section of the file.
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 msgid ""
 "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
 "start-stop-daemon line in the stop section of the file."
 msgstr ""
-"Vẫn còn có thể sửa chữa vấn đề này, bằng cách thêm chuỗi « --pidfile /var/"
-"run/sshd.pid » vào dòng « start-stop-daemon » (khởi/ngừng chạy trình nền) "
-"trong phần « stop » (ngừng chạy) của tập tin đó."
+"Vẫn còn có thể sửa chữa vấn đề này, bằng cách thêm chuỗi « --pidfile /var/run/"
+"sshd.pid » vào dòng « start-stop-daemon » (khởi/ngừng chạy trình nền) trong "
+"phần « stop » (ngừng chạy) của tập tin đó."
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr "Bắt buộc phải có khoá máy mới"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
 "algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
@@ -126,13 +126,13 @@ msgstr ""
 # msgid "You will need to generate a new host key."
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "You need to manually generate a new host key."
 msgstr "Vậy bạn cần phải tự tạo một khóa máy mới."
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr "Tắt khả năng xác thực kiểu yêu cầu/đáp ứng không?"
 
@@ -145,7 +145,7 @@ msgstr "Tắt khả năng xác thực kiểu yêu cầu/đáp ứng không?"
 # Unix password file authentication.
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -163,7 +163,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 4505d4bfa..e47413432 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-11\n"
-"Report-Msgid-Bugs-To: debian-ssh@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-19 15:36+0100\n"
+"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-11 00:10+0000\n"
 "PO-Revision-Date: 2004-02-02 18:48+1300\n"
 "Last-Translator: Hiei Xu <nicky@mail.edu.cn>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -25,14 +25,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid "Generate a new configuration file for OpenSSH?"
 msgstr "生成新的配置文件"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 #| msgid ""
 #| "Please note that this new configuration file will set the value of "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:1001
+#: ../openssh-server.templates:1001
 #, fuzzy
 msgid ""
 "It is strongly recommended that you choose to generate a new configuration "
@@ -77,7 +77,7 @@ msgstr "强烈建议让我为您生成一份新的配置文件。"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgid "Do you want to risk killing active SSH sessions?"
@@ -85,7 +85,7 @@ msgstr "您要继续吗(会有杀死活动的 ssh 会话的危险)？"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The version of /etc/init.d/ssh that you have installed, is likely to kill "
@@ -101,7 +101,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:2001
+#: ../openssh-server.templates:2001
 #, fuzzy
 #| msgid ""
 #| "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-"
@@ -115,13 +115,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 msgid "New host key mandatory"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 msgid ""
 "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
@@ -134,7 +134,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates.master:3001
+#: ../openssh-server.templates:3001
 #, fuzzy
 #| msgid "You will need to generate a new host key."
 msgid "You need to manually generate a new host key."
@@ -142,13 +142,13 @@ msgstr "您需要创建一个新的主机密钥。"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid "Disable challenge-response authentication?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -160,7 +160,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates.master:4001
+#: ../openssh-server.templates:4001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "