15 files changed, 542 insertions, 490 deletions

diff --git a/debian/changelog b/debian/changelog
index 3ddd4c77b..32ab9b5f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+openssh (1:3.6.1p2-4) unstable; urgency=low
+
+  * getent can get just one key; no need to use grep (thanks, James Troup).
+  * Move /usr/local/bin to the front of the default path, following
+    /etc/login.defs (closes: #201150).
+  * Remove specifics of problematic countries from package description
+    (closes: #197040).
+  * Update Spanish debconf template translation (thanks, Carlos Valdivia
+    Yagüe; closes: #198456).
+  * Backport upstream patch to pass monitor signals through to child
+    (closes: #164797).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 27 Jul 2003 17:31:15 +0100
+
 openssh (1:3.6.1p2-3) unstable; urgency=low
 
   * Update French debconf template translation (thanks, Christian Perrier;
diff --git a/debian/control b/debian/control
index 57a1a22a9..145204524 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Description: Secure rlogin/rsh/rcp replacement (OpenSSH)
  .
  --------------------------------------------------------------------
  .
- In some countries, particularly Russia, Iraq, and Pakistan, it may
- be illegal to use any encryption at all without a special permit.
+ In some countries it may be illegal to use any encryption at all
+ without a special permit.
 
 Package: ssh-askpass-gnome
 Section: gnome
diff --git a/debian/po/da.po b/debian/po/da.po
index 13a6995fc..0bb20e74b 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\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"
@@ -24,12 +25,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Privilegie adskillelse"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 #, fuzzy
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
@@ -41,7 +42,7 @@ msgstr ""
 "sshd_config."
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
@@ -49,12 +50,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr "Aktiver Privilegie adskillelse"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -65,7 +66,7 @@ msgstr ""
 "derfor reducerer det impakten på sikkerheds huller i sshd."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -76,7 +77,7 @@ msgstr ""
 "interaktive autentifikationer vil ikke virke."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -91,12 +92,12 @@ msgstr ""
 "med dette tilvalg, skal du sige ja her."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr "Opret ny konfigurations fil"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -111,7 +112,7 @@ msgstr ""
 "ændringer du lavede med den gamle version."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -126,7 +127,7 @@ msgstr ""
 "kan altid redigere sshd_config og slå det fra, hvis du ønsker."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -134,12 +135,12 @@ msgstr ""
 "Du rådes stærkt til at lade mig genere en ny konfigurations fil for dig."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr "Tillad kun SSH protokol 2"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -152,7 +153,7 @@ msgstr ""
 "(ssh klienten der kommer med \"potato\" er en af dem)."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -162,7 +163,7 @@ msgstr ""
 "tillader protokol 2 forbindelser."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -171,12 +172,12 @@ msgstr ""
 "instruktioner på hvad du skal gøre ved din sshd_config fil."
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr "ssh2-nøgler flettet i opsætningsfilerne"
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -188,12 +189,12 @@ msgstr ""
 "bagudkompatilitetens skyld."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Vil du fortsætte (og risikere at afbryde aktive ssh-forbindelser)?"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -204,7 +205,7 @@ msgstr ""
 "opgradering via en ssh-forbindelse."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -213,13 +214,13 @@ msgstr ""
 "'start-stop-daemon'-linjen i stop-afsnittet af filen."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "BEMÆRK: Videregivelse af X11 og adgangkontrol er som standard deaktiveret."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 #, fuzzy
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
@@ -229,7 +230,7 @@ msgstr ""
 "til 'off' som standard."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 #, fuzzy
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
@@ -239,17 +240,17 @@ msgstr ""
 "eller med kommandolinjetilvalget '-X'."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Advarsel: rsh-serveren er installeret --- sikkert ikke en god idé"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -259,12 +260,12 @@ msgstr ""
 "rsh-server."
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Advarsel: telnetd er installeret --- sikkert ikke en god idé"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -277,12 +278,12 @@ msgstr ""
 "adgangskoder og sessions-oplysninger ukrypteret over netværket."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "Advarsel: du skal oprette en ny værtsnøgle"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 #, fuzzy
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
@@ -294,17 +295,17 @@ msgstr ""
 "fra den gamle (ikke-frie, 'non-free') SSH-installation."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "Vil du have, at /usr/bin/ssh-keysign bliver installeret 'SUID root'?"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -312,7 +313,7 @@ msgstr ""
 "Du har mulighed for at installere ssh-keysign hjælperen med SUID-flaget sat."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -321,7 +322,7 @@ msgstr ""
 "protokol 2's værtsnavn-baserede autentifikation."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -331,17 +332,17 @@ msgstr ""
 "reconfigure ssh"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "Vil du køre sshd-serveren?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Denne pakke indeholder både ssh-klienten og sshd-serveren."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -350,7 +351,7 @@ msgstr ""
 "og tillade fjerne brugere i at logge på via ssh."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -361,12 +362,12 @@ msgstr ""
 "via ssh, kan du nu deaktivere sshd."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -375,7 +376,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/de.po b/debian/po/de.po
index 78efa75af..0dc0dd75f 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\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"
@@ -24,12 +25,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
@@ -37,7 +38,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
@@ -45,12 +46,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -58,7 +59,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -66,7 +67,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -76,12 +77,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -91,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -101,19 +102,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -122,26 +123,26 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -149,12 +150,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Wollen Sie weitermachen (und das Killen der Session riskieren)?"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -165,7 +166,7 @@ msgstr ""
 "dann ist das ein Problem."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -175,12 +176,12 @@ msgstr ""
 "ergänzen."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "HINWEIS: Forwarden von X11 und Authorisierung ist abgeschaltet."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -189,7 +190,7 @@ msgstr ""
 "ForwardAgent auf \"off\" gesetzt."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -198,18 +199,18 @@ msgstr ""
 "Konfigurations Dateien oder per Kommando-Zeilen Option -X ändern."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Weitere Details koennen Sie in /usr/share/doc/ssh/README.Debian finden."
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Warnung: rsh-server ist installiert --- möglicherweise"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -218,12 +219,12 @@ msgstr ""
 "Sicherheit untergräbt. Wir empfehlen, das Paket zu entfernen."
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Warnung: telnetd ist installiert --- schlechte Idee"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -235,12 +236,12 @@ msgstr ""
 "daß Login und Password unverschlüsselt durch das Netz gesendet werden."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "Warnung: Sie müssen einen neuen Host Key erzeugen"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 #, fuzzy
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
@@ -253,48 +254,48 @@ msgstr ""
 "werden."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "Möchten Sie den sshd Server starten?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Das Paket enthält sowohl den Client als auch den sshd Server."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -302,7 +303,7 @@ msgstr ""
 "Normal wird der sshd Secure Shell Server für Remote Logins per ssh gestartet."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -313,12 +314,12 @@ msgstr ""
 "können Sie hier den sshd abschalten."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -327,7 +328,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/es.po b/debian/po/es.po
index 53ff806b1..f14f15efd 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -11,25 +11,27 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-#, fuzzy
+# Carlos Valdivia Yagüe <valyag@dat,etsit.upm.es>, 2003
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\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"
+"Project-Id-Version: openssh 3.6.1p2-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"PO-Revision-Date: 2003-06-21 15:30+0200\n"
+"Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
+"Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Separación de privilegios"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
@@ -40,23 +42,22 @@ msgstr ""
 "ssh/sshd_config."
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
 "turn privilege separation off."
 msgstr ""
-"Nota: Si utiliza un núcleo Linux de la serie 2.0, la separación de "
-"privilegios fallará estrepitosamente y sshd no funcionará a no ser que la "
-"desactive."
+"Nota: Si utiliza un núcleo Linux 2.0, la separación de privilegios fallará "
+"estrepitosamente y sshd no funcionará a no ser que la desactive."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr "Activar separación de privilegios"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -68,19 +69,19 @@ msgstr ""
 "seguridad en sshd."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
 "fail, and PAM keyboard-interactive authentication won't work."
 msgstr ""
-"Desafortunadamente, la separación de privilegios no interactúa correctamente "
+"Desafortunadamente, la separación de privilegios no funciona correctamente "
 "con PAM. Cualquier módulo PAM que necesite ejecutarse como root (como, por "
 "ejemplo, pam_mkhomedir) y la autentificación interactiva PAM con teclado no "
 "funcionarán."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -95,12 +96,12 @@ msgstr ""
 "funcionan con esta opción, debería responder sí a esta pregunta."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr "Generar un nuevo fichero de configuración"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -116,7 +117,7 @@ msgstr ""
 "antigua."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -132,7 +133,7 @@ msgstr ""
 "sshd_config y poner no si lo desea."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -141,12 +142,12 @@ msgstr ""
 "configuración ahora."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir sólo la versión 2 del protocolo SSH"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -159,7 +160,7 @@ msgstr ""
 "clientes antiguos, como, por ejemplo, el incluido en \"potato\"."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -169,7 +170,7 @@ msgstr ""
 "mediante la versión 2 del protocolo."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -178,12 +179,12 @@ msgstr ""
 "instrucciones sobre cómo modificar en el fichero sshd_config."
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr "Las claves ssh2 ya se incluyen en los ficheros de configuración"
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -195,12 +196,12 @@ msgstr ""
 "mantener compatibilidad hacia atrás."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "¿Desea continuar, aún a riesgo de matar las sesiones ssh activas?"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -211,7 +212,7 @@ msgstr ""
 "no sea muy buena idea."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -220,12 +221,12 @@ msgstr ""
 "stop-daemon', en la sección 'stop' del fichero."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "NOTA: Reenvío de X11 y Autorización desactivadas por defecto."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -234,7 +235,7 @@ msgstr ""
 "ForwardX11 y ForwardAgent desactivadas."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -243,17 +244,17 @@ msgstr ""
 "ficheros de configuración o con la opción -X en línea de comandos."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Puede encontrar más detalles en /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Aviso: tiene rsh-server instalado"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -263,12 +264,12 @@ msgstr ""
 "paquete."
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: tiene telnetd instalado"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -281,12 +282,12 @@ msgstr ""
 "no viajen sin cifrar por la red."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: debe crear una nueva clave para su servidor"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -297,17 +298,17 @@ msgstr ""
 "utilidad ssh-keygen incluida en el paquete ssh no libre."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr "Necesitará generar una nueva clave para su servidor."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "¿Quiere instalar /usr/lib/ssh-keysign SUID root?"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -316,7 +317,7 @@ msgstr ""
 "root)."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -325,26 +326,26 @@ msgstr ""
 "de la versión 2 del protocolo SSH."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
-"Si duda, se recomienda que lo instale SUID. Si surgen problemas puede "
+"Si duda, se recomienda que lo instale SUID. Si le causa problemas puede "
 "cambiar de opinión posteriormente ejecutando «dpkg-reconfigure ssh»."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "¿Quiere ejecutar el servidor sshd?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Este paquete contiene el cliente ssh y el servidor sshd."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -353,7 +354,7 @@ msgstr ""
 "permitir el acceso remoto mediante ssh."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -364,23 +365,30 @@ msgstr ""
 "sshd."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
-msgstr ""
+msgstr "Las opciones de entorno para las claves, en desuso"
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
 "are using this option in an authorized_keys file, beware that the keys in "
 "question will no longer work until the option is removed."
 msgstr ""
+"Esta versión de OpenSSH tiene desactivada por defecto la opción de entorno "
+"para las claves públicas, para evitar ciertos ataques (por ejemplo, basados "
+"en LD_PRELOAD). Si utiliza esta opción en un fichero authorized_keys, las "
+"claves implicadas no funcionarán hasta que borre la opción."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "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)."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index e512adc27..68647c3f9 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -14,7 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-2\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\n"
 "PO-Revision-Date: 2003-05-22 10:34+0200\n"
 "Last-Translator: Denis Barbier <barbier@debian.org>\n"
 "Language-Team: French <Debian-l10n-french@lists.debian.org>\n"
@@ -23,12 +24,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Séparation des privilèges"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
@@ -39,7 +40,7 @@ msgstr ""
 "sshd_config."
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
@@ -50,12 +51,12 @@ msgstr ""
 "avez explicitement désactivé la séparation des privilèges."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr "Activer la séparation des privilèges"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -67,7 +68,7 @@ msgstr ""
 "de sécurité dans sshd."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -79,7 +80,7 @@ msgstr ""
 "l'authentification interactive au clavier ne fonctionnera pas."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -95,12 +96,12 @@ msgstr ""
 "est activée, dans le cas contraire vous devriez l'activer."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr "Créer un nouveau fichier de configuration"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -116,7 +117,7 @@ msgstr ""
 "aucun des réglages que vous avez faits sur l'ancienne version."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -133,7 +134,7 @@ msgstr ""
 "changer cela."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -142,12 +143,12 @@ msgstr ""
 "de configuration."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr "Autoriser la version 2 du protocole SSH uniquement"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -161,7 +162,7 @@ msgstr ""
 "la distribution Debian « Potato » en fait partie)."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -171,7 +172,7 @@ msgstr ""
 "utilisant la version 2 du protocole."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -181,12 +182,12 @@ msgstr ""
 "modifier le fichier sshd_config."
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr "Clés pour ssh2 fusionnées dans les fichiers de configuration"
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -198,13 +199,13 @@ msgstr ""
 "la compatibilité descendante."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr ""
 "Voulez-vous continuer (et risquer de rompre les sessions ssh actives) ?"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -215,7 +216,7 @@ msgstr ""
 "en train de faire cette mise à niveau à l'aide de ssh, ce serait regrettable."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -225,13 +226,13 @@ msgstr ""
 "fichier."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "NOTE : suivi de session X11 et d'agent d'autorisation désactivés par défaut."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -240,7 +241,7 @@ msgstr ""
 "options ForwardX11 et ForwardAgent à « Off » par défaut."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -250,20 +251,20 @@ msgstr ""
 "de la ligne de commande."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Vous trouverez plus d'informations dans /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Attention : rsh-server est installé -- ce n'est probablement pas une bonne "
 "idée"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -273,13 +274,13 @@ msgstr ""
 "paquet."
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Attention : telnetd est installé -- ce n'est probablement pas une bonne idée"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -292,12 +293,12 @@ msgstr ""
 "de passe et noms d'utilisateurs ne passent pas en clair sur le réseau."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "Attention : vous devez créer une nouvelle clé d'hôte"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -308,19 +309,19 @@ msgstr ""
 "keygen de l'installation précédente (non libre) de SSH."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr "Vous aurez besoin de générer une nouvelle clé d'hôte."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 "Voulez-vous que /usr/lib/ssh-keysign soit installé avec le bit SETUID "
 "activé ?"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -328,7 +329,7 @@ msgstr ""
 "Vous avez la possibilité d'installer ssh-keysign avec le bit SETUID activé."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -338,7 +339,7 @@ msgstr ""
 "protocole SSH."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -348,17 +349,17 @@ msgstr ""
 "« dpkg-reconfigure ssh »."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "Voulez-vous utiliser le serveur sshd ?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Ce paquet contient à la fois le client ssh et le serveur sshd."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -367,7 +368,7 @@ msgstr ""
 "distantes via ssh."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -378,12 +379,12 @@ msgstr ""
 "ssh, vous pouvez désactiver sshd maintenant."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr "Les options d'environnement sur les clés sont déconseillées"
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -397,7 +398,7 @@ msgstr ""
 "fonctionneront plus tant que l'option ne sera pas retirée."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index d32cab886..c31072750 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\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"
@@ -24,12 +25,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Æø¢¤ÎʬΥ"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
@@ -39,7 +40,7 @@ msgstr ""
 "sshd_conf ¤Ë¡ÖUsePrivilegeSeparation no¡×¤È¤¤¤¦¹Ô¤òÄɲà ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
@@ -49,12 +50,12 @@ msgstr ""
 "ºî¤·¤Þ¤»¤ó¡£ÌÀ¼¨Åª¤ËÆø¢Ê¬Î¥¤ò̵¸ú¤Ë¤·¤Ê¤¤¸Â¤ê¡¢sshd ¤Ïµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr "Æø¢Ê¬Î¥¤òÍ­¸ú¤Ë¤¹¤ë"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -65,7 +66,7 @@ msgstr ""
 "¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤Î±Æ¶Á¤ò¸º¤é¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -76,7 +77,7 @@ msgstr ""
 "PAM ¥­¡¼¥Ü¡¼¥ÉÂÐÏÃŪǧ¾Ú¤âÆ°ºî¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -90,12 +91,12 @@ msgstr ""
 "¤¦¤ÁÆø¢Ê¬Î¥¤È¶¦Â¸¤Ç¤­¤Ê¤¤µ¡Ç½¤ò »È¤¤¤¿¤¤¾ì¹ç°Ê³°¤Ï¡¢¡Ö¤Ï¤¤¡×¤òÁª¤Ö¤Ù¤­¤Ç¤¹¡£"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr "¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤òºî¤ê¤Þ¤¹"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -111,7 +112,7 @@ msgstr ""
 "¤ó¡£"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -125,19 +126,19 @@ msgstr ""
 "¤òÆɤó¤Ç²¼¤µ¤¤)¡¢sshd_config ¤òÊÔ½¸¤·¤Æ¡Öno¡×¤ËÀß Äꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr "¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤ò¶¯¤¯¤ª´«¤á¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr "SSH ¥×¥í¥È¥³¥ë 2 ¤Î¤ß¤òµö²Ä¤·¤Þ¤¹"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -150,7 +151,7 @@ msgstr ""
 "ssh ¥¯¥é¥¤¥¢¥ó¥È¤âÀܳ¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹)¡£"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -159,7 +160,7 @@ msgstr ""
 "¤½¤Î¥­¡¼¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -168,12 +169,12 @@ msgstr ""
 "¤¦¤ËÊѹ¹¤·¤¿¤é¤è¤¤¤«¤¬Ê¬¤«¤ê¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr "ssh2 ¥­¡¼¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤ËÅý¹ç¤µ¤ì¤Þ¤¹"
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -184,12 +185,12 @@ msgstr ""
 "¤Þ¤·¤¿¡£¸åÊý¸ß´¹À­¤òÊݤĤ¿¤á¤Ë¤Ï¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤¬É¬Í× ¤Ç¤¹¡£"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "³¤±¤Æ¤¤¤¤¤Ç¤¹¤« (ÀܳÃæ¤Î ssh ¥»¥Ã¥·¥ç¥ó¤¬ÀÚ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -200,7 +201,7 @@ msgstr ""
 "¤¿¤Ç¤¹¡£"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -209,12 +210,12 @@ msgstr ""
 "daemon ¤Î¹Ô¤Ë¡Ö--pidfile /var/run/sshd.pid¡×¤ÈÄɲä·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "Ãí°Õ: X11 ¤Èǧ¾Ú¤Î¥Õ¥©¥ï¡¼¥Ç¥£¥ó¥°¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¶Ø»ß¤µ¤ì¤Þ¤¹"
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -223,7 +224,7 @@ msgstr ""
 "¥Õ¥©¥ë¥È¤Ç¤Ï¡Öoff¡×¤ËÀßÄꤵ¤ì¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -232,18 +233,18 @@ msgstr ""
 "ÍѤǤ­¤ë¥µ¡¼¥Ð¤ËÂФ·¤Æµö²Ä¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "¾ÜºÙ¤Ï /usr/share/doc/ssh/README.Debian ¤òÆɤó¤Ç²¼¤µ¤¤¡£"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "·Ù¹ð: rsh-server ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤Ö¤óÎɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -253,12 +254,12 @@ msgstr ""
 "¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "·Ù¹ð: telnetd ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤Ö¤óÎɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -271,12 +272,12 @@ msgstr ""
 "Êó¤¬Î®¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "·Ù¹ð: ¿·¤·¤¤¥Û¥¹¥È¥­¡¼¤òºî¤é¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -287,17 +288,17 @@ msgstr ""
 "¤Ç¤Ï¤Ê¤¤) SSH ¤Ë¤Ï ssh-keygen ¥æ¡¼¥Æ¥£¥ê¥Æ¥£ ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr "¿·¤·¤¤¥Û¥¹¥È¥­¡¼¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "/usr/bin/ssh-keysign ¤ò SUID root ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«?"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -306,7 +307,7 @@ msgstr ""
 "Áª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -315,7 +316,7 @@ msgstr ""
 "»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -324,17 +325,17 @@ msgstr ""
 "¤Ð¡¢dpkg-reconfigure ssh ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ÇÀßÄê¤òÊѹ¹ ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "sshd ¥µ¡¼¥Ð¤ò¼Â¹Ô¤·¤Þ¤¹¤«?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ssh ¥¯¥é¥¤¥¢¥ó¥È¤È sshd ¥µ¡¼¥Ð¤ÎξÊý¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -343,7 +344,7 @@ msgstr ""
 "¤Ë¤¹¤ë¤¿¤á¤Ë¼Â¹Ô¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -354,12 +355,12 @@ msgstr ""
 "¤ª¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr "¸°¤Î´Ä¶­¥ª¥×¥·¥ç¥ó¤Ï̵¸ú¤ËÀßÄꤵ¤ì¤Þ¤·¤¿"
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -372,7 +373,7 @@ msgstr ""
 "¤ÏÍøÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 29e91be50..f483a3ada 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\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"
@@ -24,12 +25,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Separacja uprawnieñ"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
@@ -40,7 +41,7 @@ msgstr ""
 "sshd_config."
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
@@ -51,12 +52,12 @@ msgstr ""
 "wy³±czysz separacji uprawnieñ w /etc/ssh/sshd_config."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr "W³±czenie separacji uprawnieñ"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -67,7 +68,7 @@ msgstr ""
 "efekty luk bezpieczeñstwa w sshd."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -79,7 +80,7 @@ msgstr ""
 "(keyboard-interactive authentication)."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -95,12 +96,12 @@ msgstr ""
 "'tak'."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr "Wygeneruj nowy plik konfiguracyjny"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -115,7 +116,7 @@ msgstr ""
 "przez ciebie w starej wersji zmian."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -131,7 +132,7 @@ msgstr ""
 "zgadzasz."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -139,12 +140,12 @@ msgstr ""
 "Jest bardzo wskazane aby¶ pozwoli³ mi wygenerowaæ nowy plik konfiguracyjny."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr "Zezwalaj wy³±cznie na wersjê 2 protoko³u SSH"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -157,7 +158,7 @@ msgstr ""
 "wersjom klientów (dotyczy to np. klienta ssh do³±czanego do \"potato\")."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -167,7 +168,7 @@ msgstr ""
 "protoko³u."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -176,12 +177,12 @@ msgstr ""
 "zmieniæ w sshd_config znajduj± siê w README.Debian."
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr "klucze ssh2 w³±czone do plików konfiguracyjnych"
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -192,12 +193,12 @@ msgstr ""
 "potrzebne. Bêd± one jednak odczytywane aby zachowaæ wsteczn± kompatybilno¶æ."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Czy chcesz kontynuowaæ (i ryzykowaæ zabicie aktywnych sesji ssh) ?"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -208,7 +209,7 @@ msgstr ""
 "(tm)."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -217,13 +218,13 @@ msgstr ""
 "stop-daemon w sekcji stop tego pliku."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "UWAGA: Przekazywanie (forwarding) X11 i Autoryzacji jest domy¶lnie wy³±czone."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -232,7 +233,7 @@ msgstr ""
 "ustawione  domy¶lnie na 'off'."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -241,18 +242,18 @@ msgstr ""
 "przy pomocy opcji -X z linii komend."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Wiêcej szczegó³ów znajdziesz w /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: serwer rsh jest zainstalowany --- prawdopodobnie nienajlepszy pomys³"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -262,13 +263,13 @@ msgstr ""
 "pakiet."
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: telnetd jest zainstalowany --- prawdopodobnie nienajlepszy pomys³"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -281,12 +282,12 @@ msgstr ""
 "danych sesji przez sieæ."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "Uwaga: musisz utworzyæ nowy klucz hosta"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -297,17 +298,17 @@ msgstr ""
 "polecenia ssh-keygen ze starego SSH (non-free)."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr "Bêdziesz musia³ wygenerowaæ nowy klucz hosta."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "Czy chcesz aby /usr/lib/ssh-keysign by³ zainstalowany jako SUID root?"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -316,7 +317,7 @@ msgstr ""
 "bitem SETUID."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -325,7 +326,7 @@ msgstr ""
 "autentykacji drugiej wersji protoko³u SSH."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -335,17 +336,17 @@ msgstr ""
 "reconfigure ssh"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "Czy chcesz uruchamiaæ serwer sshd ?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Ten pakiet zawiera zarówno klienta ssh, jak i serwer sshd."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -354,7 +355,7 @@ msgstr ""
 "zdalny dostêp przez ssh."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -365,12 +366,12 @@ msgstr ""
 "to mo¿esz teraz wy³±czyæ serwer sshd."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -379,7 +380,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 2f58a1162..84a07a973 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,7 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openssh-3.5p1-4\n"
-"POT-Creation-Date: 2003-03-08 16:13-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\n"
 "PO-Revision-Date: 2003-03-08 16:56+0300\n"
 "Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -23,64 +24,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Separação de Previlégios"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
 "sshd_config."
 msgstr ""
-"A separação de previlégios está habilitado por padrão, portanto caso "
-"você decida que deseja desabilitá-la você precisará adicionar a linha "
+"A separação de previlégios está habilitado por padrão, portanto caso você "
+"decida que deseja desabilitá-la você precisará adicionar a linha "
 "\"UsePrivilegeSeparation no\" ao arquivo /etc/ssh/sshd_config."
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
 "turn privilege separation off."
 msgstr ""
-"NB ! Caso você esteja executando um kernel Linux da séria 2.0 o recurso "
-"de separação de privilégios não funcionará e seu daemon sshd irá falhar "
-"ao iniciar a menos que você explicitamente desabilite o recurso de "
-"separação de privilégios."
+"NB ! Caso você esteja executando um kernel Linux da séria 2.0 o recurso de "
+"separação de privilégios não funcionará e seu daemon sshd irá falhar ao "
+"iniciar a menos que você explicitamente desabilite o recurso de separação de "
+"privilégios."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr "Habilitar Separação de Privilégios"
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
 "reduces the impact of security holes in sshd."
 msgstr ""
-"Esta versão do OpenSSH contém a nova opção de separação de privilégios. "
-"Esta opção reduz significativamente a quantidade de código que é "
-"executada como root e portanto reduz o impacto de falhas de segurança "
-"no sshd."
+"Esta versão do OpenSSH contém a nova opção de separação de privilégios. Esta "
+"opção reduz significativamente a quantidade de código que é executada como "
+"root e portanto reduz o impacto de falhas de segurança no sshd."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
 "fail, and PAM keyboard-interactive authentication won't work."
 msgstr ""
-"Infelizmente, a separação de privilégios interage de maneira ruim com "
-"o PAM. Quaisquer módulos de sessão PAM que precisem ser executados como "
-"root (pam_mkhomedir, por exemplo) irão falhar e autenticação interativa "
-"com teclado do PAM não funcionará."
+"Infelizmente, a separação de privilégios interage de maneira ruim com o PAM. "
+"Quaisquer módulos de sessão PAM que precisem ser executados como root "
+"(pam_mkhomedir, por exemplo) irão falhar e autenticação interativa com "
+"teclado do PAM não funcionará."
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -88,21 +88,21 @@ msgid ""
 "start at all) or know you need to use PAM features that won't work with this "
 "option, you should say yes here."
 msgstr ""
-"Uma vez que você optou por permitir que o debconf gere o arquivo "
-"sshd_config para você, é possível escolher se você deseja ter ou não o "
-"recurso de separação de privilégios habilitada. A menos que você esteja "
-"executando um kernel Linux da série 2.0 (neste caso você *deve* "
-"responder negativamente a esta pergunta ou seu daemon sshd não será "
-"iniciado) ou saiba que você precisa utilizar recursos do PAM que não "
-"funcionam com esta opção habilitada você deve responder sim aqui."
+"Uma vez que você optou por permitir que o debconf gere o arquivo sshd_config "
+"para você, é possível escolher se você deseja ter ou não o recurso de "
+"separação de privilégios habilitada. A menos que você esteja executando um "
+"kernel Linux da série 2.0 (neste caso você *deve* responder negativamente a "
+"esta pergunta ou seu daemon sshd não será iniciado) ou saiba que você "
+"precisa utilizar recursos do PAM que não funcionam com esta opção habilitada "
+"você deve responder sim aqui."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr "Gerar novo arquivo de configuração"
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -110,16 +110,16 @@ msgid ""
 "config), which will work with the new server version, but will not contain "
 "any customisations 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' "
-"(Debian versão 2.2), a versão do Debian da qual você parece estar "
-"atualizando. Esse assistente de confgiuração inicial pode agora gerar "
-"um novo arquivo de configuração (/etc/ssh/sshd_config) que irá "
-"funcionar com o nova versão do servidor sshd mas não irá conter nenhuma "
-"personalização que você possa ter feito na versão anterior."
+"Esta versão do OpenSSH possui um arquivo de configuração consideravelmente "
+"diferente da versão fornecida com o Debian 'Potato' (Debian versão 2.2), a "
+"versão do Debian da qual você parece estar atualizando. Esse assistente de "
+"confgiuração inicial pode agora gerar um novo arquivo de configuração (/etc/"
+"ssh/sshd_config) que irá funcionar com o nova versão do servidor sshd mas "
+"não irá conter nenhuma personalização que você possa ter feito na versão "
+"anterior."
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -127,89 +127,88 @@ msgid ""
 "the correct default (see README.Debian for more details), but you can always "
 "edit sshd_config and set it to no if you wish."
 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 de root poderá conectar via ssh "
-"diretamente como root no servidor onde este pacote esta sendo "
-"instalado). A opinião do mantenedor do pacote é que esse é o "
-"comportamente padrão correto (consulte o arquivo README.Debian deste "
-"pacote para maiores detalhes), mas você poderá sempre editar o arquivo "
-"sshd_config e definir esta opção para \"no\" caso você não concorde com "
-"o mantenedor do OpenSSH."
-
-#. Description
-#: ../templates:41
+"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 de root poderá conectar via ssh diretamente como root no "
+"servidor onde este pacote esta sendo instalado). A opinião do mantenedor do "
+"pacote é que esse é o comportamente padrão correto (consulte o arquivo "
+"README.Debian deste pacote para maiores detalhes), mas você poderá sempre "
+"editar o arquivo sshd_config e definir esta opção para \"no\" caso você não "
+"concorde com o mantenedor do OpenSSH."
+
+#. Description
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr ""
-"É fortemente recomendado que você permita que o novo arquivo de "
-"configuração será gerado automaticamente para você."
+"É fortemente recomendado que você permita que o novo arquivo de configuração "
+"será gerado automaticamente para você."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir somente protocolo SSH versão 2"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
 "things down on low end machines and might prevent older clients from "
 "connecting (the ssh client shipped with \"potato\" is affected)."
 msgstr ""
-"Esta versão do OpenSSH suporta a versão 2 do protocolo ssh, a qual é "
-"muito mais segura que a versão anterior. É recomendado desabilitar o "
-"suporte ao protocolo ssh versão 1, porém isto fará com que conexões "
-"fiquem mais lentas em máquinas mais antigas e pode impedir que clientes "
-"antigos consigam se conectar (o cliente ssh fornecido com a versão do "
-"Debian 2.2 \"potato\" é afetada.)"
+"Esta versão do OpenSSH suporta a versão 2 do protocolo ssh, a qual é muito "
+"mais segura que a versão anterior. É recomendado desabilitar o suporte ao "
+"protocolo ssh versão 1, porém isto fará com que conexões fiquem mais lentas "
+"em máquinas mais antigas e pode impedir que clientes antigos consigam se "
+"conectar (o cliente ssh fornecido com a versão do Debian 2.2 \"potato\" é "
+"afetada.)"
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
-"Por favor note também que as chaves usadas para o protocolo 1 são "
-"diferentes portanto você não poderá usá-las caso você somente permita "
-"conexões usando o protocolo 2."
+"Por favor note também que as chaves usadas para o protocolo 1 são diferentes "
+"portanto você não poderá usá-las caso você somente permita conexões usando o "
+"protocolo 2."
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
-"Caso você posteriormente mude de idéia sobre esta configuração, o "
-"arquivo README.Debian deste pacote possui instruções sobre o que mudar "
-"em seu arquivo de configuração sshd_config."
+"Caso você posteriormente mude de idéia sobre esta configuração, o arquivo "
+"README.Debian deste pacote possui instruções sobre o que mudar em seu "
+"arquivo de configuração sshd_config."
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr "Chaves ssh2 incluídas nos arquivos de configuração"
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
 "needed. They will still be read in order to maintain backwards compatibility"
 msgstr ""
 "A partir do versão 3 o OpenSSH não usa mais arquivos separados para as "
-"chaves ssh1 e ssh2. Isto significa que os arquivos \"authorized_keys2\" "
-"e \"know_hosts2\" não são mais necessários. Os mesmos continuarão a ser "
-"lidos para manter a compatibilidade com versões anteriores."
+"chaves ssh1 e ssh2. Isto significa que os arquivos \"authorized_keys2\" e "
+"\"know_hosts2\" não são mais necessários. Os mesmos continuarão a ser lidos "
+"para manter a compatibilidade com versões anteriores."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Deseja continuar (e arriscar acabar com sessões ssh ativas) ?"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -220,7 +219,7 @@ msgstr ""
 "atualização através de uma sessão ssh, isto seria uma Coisa Ruim(tm)."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -229,13 +228,12 @@ msgstr ""
 "start-stop-daemon na seção stop deste arquivo."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
-msgstr ""
-"NOTA: Encaminhamento de X11 e Autorização desabilitados por padrão."
+msgstr "NOTA: Encaminhamento de X11 e Autorização desabilitados por padrão."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -244,7 +242,7 @@ msgstr ""
 "ForwardAgent definidas como ``off'' por padrão."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -253,18 +251,18 @@ msgstr ""
 "arquivos de configuração, ou com a opção de linha de comando -X."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Maiores detalhes podem ser encontrados em /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Aviso: rsh-server está instalado --- provavelmente não é uma boa idéia"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -274,12 +272,12 @@ msgstr ""
 "remover este pacote."
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: telnetd está instalado --- provavelmente não é uma boa idéia"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -292,12 +290,12 @@ msgstr ""
 "e informações de sessão através da rede."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: você deve criar uma nova host key"
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -308,55 +306,55 @@ msgstr ""
 "o utilitário ssh-keygen da antiga (non-free) instalação SSH."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr "Você precisará gerar uma nova host key."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "Deseja que que /usr/lib/ssh-keysign seja instalado SUID root ?"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
 msgstr ""
-"Existe a opção de instalar o cliente auxiliar ssh-keysign com o bit "
-"SUID definido."
+"Existe a opção de instalar o cliente auxiliar ssh-keysign com o bit SUID "
+"definido."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
 msgstr ""
-"Caso você instale o ssh-keysign com o bit SUID ativado, você será capaz "
-"de usar a autenticação baseada em host do protocolo SSH 2."
+"Caso você instale o ssh-keysign com o bit SUID ativado, você será capaz de "
+"usar a autenticação baseada em host do protocolo SSH 2."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
-"Caso esteja em dúvida, é sugerido que você instale com o bit SUID "
-"ativado. Caso isso cause problemas e você mude de idéia "
-"posteriormente execute o comando : dpkg-reconfigure ssh"
+"Caso esteja em dúvida, é sugerido que você instale com o bit SUID ativado. "
+"Caso isso cause problemas e você mude de idéia posteriormente execute o "
+"comando : dpkg-reconfigure ssh"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "Você quer executar o servidor sshd ?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Este pacote contém ambos o cliente ssh e o servidor sshd."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -365,7 +363,7 @@ msgstr ""
 "remotos via ssh."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -376,32 +374,31 @@ msgstr ""
 "desabilitar o sshd aqui."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr "Opções ed ambiente sobre chaves estão obsoletas"
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
 "are using this option in an authorized_keys file, beware that the keys in "
 "question will no longer work until the option is removed."
 msgstr ""
-"Esta versão do OpenSSH desabilita a opção de ambiente para chaves "
-"públicas por padrão par evitar certos ataques (por exemplo, "
-"LD_PRELOAD). Caso você esteja usando esta opção em um arquivo "
-"authorized_keys, tenha cuidado pois as chaves em questão não irão "
-"mais funcionar até que esta opção seja removida."
+"Esta versão do OpenSSH desabilita a opção de ambiente para chaves públicas "
+"por padrão par evitar certos ataques (por exemplo, LD_PRELOAD). Caso você "
+"esteja usando esta opção em um arquivo authorized_keys, tenha cuidado pois "
+"as chaves em questão não irão mais funcionar até que esta opção seja "
+"removida."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
 "sshd_config(5) manual page."
 msgstr ""
-"Para reabilitar esta opção, defina a opção "
-"\"PermitUserEnvironment yes\" no arquivo /et/ssh/sshd_config depois da "
-"a atualização terminar, atentando para o aviso na página de manual do "
-"sshd_config(5)."
+"Para reabilitar esta opção, defina a opção \"PermitUserEnvironment yes\" no "
+"arquivo /et/ssh/sshd_config depois da a atualização terminar, atentando para "
+"o aviso na página de manual do sshd_config(5)."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 7aa13493f..0c41608c4 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\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"
@@ -24,12 +25,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
@@ -37,7 +38,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
@@ -45,12 +46,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -58,7 +59,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -66,7 +67,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -76,12 +77,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -91,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -101,19 +102,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -122,26 +123,26 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -149,12 +150,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "÷Ù ÈÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ (ÒÉÓËÕÑ ÐÏÔÅÒÑÔØ ÁËÔÉ×ÎÙÅ ssh-ÓÏÅÄÉÎÅÎÉÑ)?"
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -165,7 +166,7 @@ msgstr ""
 "ÓÅÓÓÉÀ, ÔÏ ÜÔÏ ðÌÏÈÁÑ ÷ÅÝØ (tm)."
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -174,12 +175,12 @@ msgstr ""
 "start-stop-daemon × ÒÁÚÄÅÌÅ stop ÜÔÏÇÏ ÆÁÊÌÁ."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "ðòéíåþáîéå: æÏÒ×ÁÒÄÉÎÇ X11 É Authorization ÚÁÐÒÅÝÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -188,7 +189,7 @@ msgstr ""
 "ForwardAgent ÕÓÔÁÎÏ×ÌÅÎÎÙÍÉ × ``off'' ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -197,18 +198,18 @@ msgstr ""
 "ÎÁÓÔÒÏÅÞÎÙÈ ÆÁÊÌÏ×, ÉÌÉ ÐÁÒÁÍÅÔÒÏÍ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ -X."
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "äÏÐÏÌÎÉÔÅÌØÕÀ ÉÎÆÏÒÍÁÃÉÀ ÍÏÖÎÏ ÎÁÊÔÉ × /usr/share/doc/ssh/README.Debian"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÏ×ÌÅÎ rsh-server --- ×ÉÄÉÍÏ, ÎÅ ÏÞÅÎØ ÈÏÒÏÛÏ"
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -217,12 +218,12 @@ msgstr ""
 "ÈÏÔÉÔÅ ÐÏ×ÙÓÉÔØ ÕÓÔÁÎÁ×ÌÉ×ÁÑ ssh. òÅËÏÍÅÎÄÕÅÔÓÑ ÕÄÁÌÉÔØ ÜÔÏÔ ÐÁËÅÔ."
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÏ×ÌÅÎ telnetd --- ×ÉÄÉÍÏ, ÎÅ ÏÞÅÎØ ÈÏÒÏÛÏ"
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -235,12 +236,12 @@ msgstr ""
 "ÐÏÌØÚÏ×ÁÔÅÌÅÊ É ÐÒÏÞÕÀ ÉÎÆÏÒÍÁÃÉÀ × telnet-ÓÅÓÓÉÑÈ."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ×Ù ÄÏÌÖÎÙ ÓÏÚÄÁÔØ ÎÏ×ÙÊ ËÌÀÞ ÍÁÛÉÎÙ."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -251,18 +252,18 @@ msgstr ""
 "keygen ÏÔ ÓÔÁÒÏÊ (ÎÅÓ×ÏÂÏÄÎÏÊ) ÉÎÓÔÁÌÌÑÃÉÉ SSH."
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr "÷ÁÍ ÎÁÄÏ ÂÕÄÅÔ ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÙÊ ËÌÀÞ ÈÏÓÔÁ."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 #, fuzzy
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "èÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ /usr/bin/ssh ËÁË SUID root?"
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 #, fuzzy
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
@@ -271,7 +272,7 @@ msgstr ""
 "÷Ù  ÉÍÅÅÔÅ  ×ÏÚÍÏÖÎÏÓÔØ  ÕÓÔÁÎÏ×ÉÔØ /usr/bin/ssh Ó ÕÓÔÁÎÏ×ÌÅÎÎÙÍ ÂÉÔÏÍ SUID."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 #, fuzzy
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
@@ -282,7 +283,7 @@ msgstr ""
 "ÔÒÁÄÉÃÉÏÎÎÏÅ ÐÏ×ÅÄÅÎÉÅ."
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 #, fuzzy
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
@@ -295,17 +296,17 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ×ÁÍÉ ÐÒÁ×ÉÌ ÆÁÊÒ×ÏÌÁ."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr "èÏÔÉÔÅ ÚÁÐÕÓÔÉÔØ ÓÅÒ×ÅÒ sshd?"
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ É ssh-ËÌÉÅÎÔ, É ssh-ÓÅÒ×ÅÒ."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -314,7 +315,7 @@ msgstr ""
 "ÒÅÇÉÓÔÒÁÃÉÉ × ÓÉÓÔÅÍÅ ÞÅÒÅÚ ssh."
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -325,12 +326,12 @@ msgstr ""
 "ÔÏ ×Ù ÍÏÖÅÔÅ ÓÅÊÞÁÓ ÚÁÐÒÅÔÉÔØ sshd."
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -339,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 9d38d138b..8cfe6abe9 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-18 03:08+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-27 17:26+0100\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"
@@ -24,12 +25,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid "Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "Privilege separation is turned on by default, so if you decide you want it "
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
@@ -37,7 +38,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:3
+#: ../templates.master:3
 msgid ""
 "NB! If you are running a 2.0 series Linux kernel, then privilege separation "
 "will not work at all, and your sshd will fail to start unless you explicitly "
@@ -45,12 +46,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid "Enable Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -58,7 +59,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -66,7 +67,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:23
+#: ../templates.master:23
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
@@ -76,12 +77,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid "Generate new configuration file"
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -91,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -101,19 +102,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:41
+#: ../templates.master:41
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -122,26 +123,26 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
 #. Description
-#: ../templates:60
+#: ../templates.master:60
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
 #. Description
-#: ../templates:74
+#: ../templates.master:74
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -149,12 +150,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr ""
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -162,55 +163,55 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:83
+#: ../templates.master:83
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
 msgstr ""
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
 msgstr ""
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
 msgstr ""
 
 #. Description
-#: ../templates:93
+#: ../templates.master:93
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 
 #. Description
-#: ../templates:104
+#: ../templates.master:104
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
 msgstr ""
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 
 #. Description
-#: ../templates:111
+#: ../templates.master:111
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -219,12 +220,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "Warning: you must create a new host key"
 msgstr ""
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -232,55 +233,55 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:119
+#: ../templates.master:119
 msgid "You will need to generate a new host key."
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
 msgstr ""
 
 #. Description
-#: ../templates:129
+#: ../templates.master:129
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "Do you want to run the sshd server ?"
 msgstr ""
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr ""
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
 msgstr ""
 
 #. Description
-#: ../templates:142
+#: ../templates.master:142
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -288,12 +289,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -302,7 +303,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates:154
+#: ../templates.master:154
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/postinst b/debian/postinst
index b47a9d381..292023999 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -233,7 +233,7 @@ create_alternatives() {
 }
 
 setup_sshd_user() {
-        if ! getent passwd | grep -q '^sshd:'; then
+        if ! getent passwd sshd >/dev/null; then
                 adduser --quiet --system --no-create-home --home /var/run/sshd sshd
         fi
 }
@@ -262,14 +262,14 @@ set_sshd_permissions() {
 fix_ssh_group() {
         # Try to remove non-system group mistakenly created by 1:3.5p1-1.
         # set_ssh_agent_permissions() below will re-create it properly.
-        if getent group | grep -q '^ssh:'; then
+        if getent group ssh >/dev/null; then
                 delgroup --quiet ssh || true
         fi
 }
 
 
 set_ssh_agent_permissions() {
-        if ! getent group | grep -q '^ssh:'; then
+        if ! getent group ssh >/dev/null; then
                 addgroup --system --quiet ssh
         fi
         if ! [ -x /usr/sbin/dpkg-statoverride ] || \
diff --git a/debian/rules b/debian/rules
index 0a58b753b..9ddaf5a80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ build-stamp:
         then mv version.h version.h.upstream; mv version.h.new version.h; \
         else echo "Version number change failed"; exit 1; \
         fi
-        ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 \
+        ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 \
                 --with-privsep-path=/var/run/sshd  --without-rand-helper
         $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -fno-builtin-log -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED' \
                 SSH_KEYSIGN='/usr/lib/ssh-keysign'
diff --git a/debian/templates b/debian/templates
index f3d746b54..738a91bed 100644
--- a/debian/templates
+++ b/debian/templates
@@ -22,18 +22,17 @@ Description-es: Separación de privilegios
  ejecuta como root, por lo que reduce el impacto de posibles agujeros de
  seguridad en sshd.
  .
- Desafortunadamente, la separación de privilegios no interactúa
- correctamente con PAM. Cualquier módulo PAM que necesite ejecutarse como
- root (como, por ejemplo, pam_mkhomedir) y la autentificación interactiva
- PAM con teclado no funcionarán.
+ Desafortunadamente, la separación de privilegios no funciona correctamente
+ con PAM. Cualquier módulo PAM que necesite ejecutarse como root (como, por
+ ejemplo, pam_mkhomedir) y la autentificación interactiva PAM con teclado
+ no funcionarán.
  .
  La separación de privilegios está activa por defecto, por lo que si decide
  desactivarla, tiene que añadir "UsePrivilegeSeparation no" al fichero
  /etc/ssh/sshd_config.
  .
- Nota: Si utiliza un núcleo Linux de la serie 2.0, la separación de
- privilegios fallará estrepitosamente y sshd no funcionará a no ser que la
- desactive.
+ Nota: Si utiliza un núcleo Linux 2.0, la separación de privilegios fallará
+ estrepitosamente y sshd no funcionará a no ser que la desactive.
 Description-fr: Séparation des privilèges
  Cette version d'OpenSSH est livrée avec la nouvelle option de séparation
  des privilèges. Cela réduit de manière significative la quantité de code
@@ -141,10 +140,10 @@ Description-es: Activar separación de privilegios
  ejecuta como root, por lo que reduce el impacto de posibles agujeros de
  seguridad en sshd.
  .
- Desafortunadamente, la separación de privilegios no interactúa
- correctamente con PAM. Cualquier módulo PAM que necesite ejecutarse como
- root (como, por ejemplo, pam_mkhomedir) y la autentificación interactiva
- PAM con teclado no funcionarán.
+ Desafortunadamente, la separación de privilegios no funciona correctamente
+ con PAM. Cualquier módulo PAM que necesite ejecutarse como root (como, por
+ ejemplo, pam_mkhomedir) y la autentificación interactiva PAM con teclado
+ no funcionarán.
  .
  Puesto que ha elegido crear automáticamente el fichero sshd_config, puede
  decidir ahora si quiere activar la opción de separación de privilegios. A
@@ -765,7 +764,7 @@ Description-es: ¿Quiere instalar /usr/lib/ssh-keysign SUID root?
  Si hace ssh-keysign SUID, podrá usar la autentificiación basada en
  servidor de la versión 2 del protocolo SSH.
  .
- Si duda, se recomienda que lo instale SUID. Si surgen problemas puede
+ Si duda, se recomienda que lo instale SUID. Si le causa problemas puede
  cambiar de opinión posteriormente ejecutando «dpkg-reconfigure ssh».
 Description-fr: Voulez-vous que /usr/lib/ssh-keysign soit installé avec le bit SETUID activé ?
  Vous avez la possibilité d'installer ssh-keysign avec le bit SETUID
@@ -905,6 +904,16 @@ Description: Environment options on keys have been deprecated
  To re-enable this option, set "PermitUserEnvironment yes" in
  /etc/ssh/sshd_config after the upgrade is complete, taking note of the
  warning in the sshd_config(5) manual page.
+Description-es: Las opciones de entorno para las claves, en desuso
+ Esta versión de OpenSSH tiene desactivada por defecto la opción de entorno
+ para las claves públicas, para evitar ciertos ataques (por ejemplo,
+ basados en LD_PRELOAD). Si utiliza esta opción en un fichero
+ authorized_keys, las claves implicadas no funcionarán hasta que borre la
+ opción.
+ .
+ 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).
 Description-fr: Les options d'environnement sur les clés sont déconseillées
  Dans cette version d'OpenSSH, l'option d'environnement est, par défaut,
  désactivée pour les clés publiques. Cela est destiné à la prévention de
diff --git a/monitor.c b/monitor.c
index bce9e684c..bd39f7ccb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -139,6 +139,7 @@ static char *hostbased_chost = NULL;
 static char *auth_method = "unknown";
 static int session_id2_len = 0;
 static u_char *session_id2 = NULL;
+static pid_t monitor_child_pid;
 
 struct mon_table {
         enum monitor_reqtype type;
@@ -310,9 +311,25 @@ monitor_child_preauth(struct monitor *pmonitor)
         return (authctxt);
 }
 
+static void
+monitor_set_child_handler(pid_t pid)
+{
+        monitor_child_pid = pid;
+}
+
+static void
+monitor_child_handler(int signal)
+{
+        kill(monitor_child_pid, signal);
+}
+
 void
 monitor_child_postauth(struct monitor *pmonitor)
 {
+        monitor_set_child_handler(pmonitor->m_pid);
+        signal(SIGHUP, &monitor_child_handler);
+        signal(SIGTERM, &monitor_child_handler);
+
         if (compat20) {
                 mon_dispatch = mon_dispatch_postauth20;