24 files changed, 450 insertions, 693 deletions

diff --git a/debian/changelog b/debian/changelog
index 3818cf070..1bdde0ce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ openssh (1:4.1p1-2) UNRELEASED; urgency=low
   * Drop debconf support for allowing SSH protocol 1, which is discouraged
     and has not been the default since openssh 1:3.0.1p1-1. Users who need
     this should edit sshd_config instead (closes: #147212).
+  * Since ssh-keysign isn't used by default (you need to set
+    EnableSSHKeysign to "yes" in /etc/ssh/ssh_config), having a debconf
+    question to ask whether it should be setuid is overkill, and the
+    question text had got out of date anyway. Remove this question, ship
+    ssh-keysign setuid in openssh-client.deb, and set a statoverride if the
+    debconf question was previously set to false.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 31 May 2005 02:50:49 +0100
 
diff --git a/debian/openssh-client.config b/debian/openssh-client.config
index 7490526fa..736e464ed 100644
--- a/debian/openssh-client.config
+++ b/debian/openssh-client.config
@@ -3,17 +3,24 @@
 action=$1
 version=$2
 
-if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
-  version=1.2.27
-  cp -a /etc/ssh-nonfree /etc/ssh
-fi
-
 # Source debconf library.
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-db_input medium ssh/SUID_client || true
+if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
+  version=1.2.27
+  cp -a /etc/ssh-nonfree /etc/ssh
+fi
 
-db_go
+# Was ssh-keysign's setuid bit turned off using the obsolete debconf
+# question? If so, turn this into a statoverride. (Ugh.)
+if dpkg --compare-versions "$2" lt 1:4.1p1-2 && \
+    db_get ssh/SUID_client && [ "$RET" = false ] &&
+    [ -x /usr/sbin/dpkg-statoverride ] && \
+    ! dpkg-statoverride --list /usr/lib/ssh-keysign && \
+    ! dpkg-statoverride --list /usr/lib/openssh/ssh-keysign; then
+        dpkg-statoverride --update --add root root 0755 \
+                /usr/lib/openssh/ssh-keysign
+fi
 
 exit 0
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index 4744a34a1..466801057 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -73,16 +73,6 @@ set_ssh_permissions() {
                         dpkg-statoverride --remove /usr/lib/ssh-keysign || true
                 fi
         fi
-
-        if [ ! -x /usr/sbin/dpkg-statoverride ] || \
-             ! dpkg-statoverride --list /usr/lib/openssh/ssh-keysign >/dev/null; then
-                db_get ssh/SUID_client
-                if [ "$RET" = "false" ] ; then
-                        chmod 0755 /usr/lib/openssh/ssh-keysign
-                elif [ "$RET" = "true" ] ; then
-                        chmod 4755 /usr/lib/openssh/ssh-keysign
-                fi
-        fi
 }
 
 fix_ssh_group() {
@@ -113,7 +103,4 @@ if [ "$2" = "1:3.5p1-1" ]; then
 fi
 set_ssh_agent_permissions
 
-
-db_stop
-
 exit 0
diff --git a/debian/openssh-client.templates.master b/debian/openssh-client.templates.master
deleted file mode 100644
index 1cb84bf04..000000000
--- a/debian/openssh-client.templates.master
+++ /dev/null
@@ -1,12 +0,0 @@
-Template: ssh/SUID_client
-Type: boolean
-Default: true
-_Description: Do you want ssh-keysign to be installed SUID root?
- You have the option of installing the ssh-keysign helper with the SUID bit
- set.
- .
- If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2
- host-based authentication.
- .
- 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
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 292dced6e..a45424a6b 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1,2 +1 @@
-[type: gettext/rfc822deb] openssh-client.templates.master
 [type: gettext/rfc822deb] openssh-server.templates.master
diff --git a/debian/po/ca.po b/debian/po/ca.po
index cd28f7cf7..f102c856f 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh_1:3.8p1-3_templates\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-03-05 19:46GMT\n"
 "Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -16,40 +16,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Voleu que el fitxer ssh-keysign s'instal·li SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "Podeu instal·lar l'ajudant del ssh-keysign amb el bit SUID definit."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Si definiu l'ssh-keysign SUID podreu utilitzat l'autenticació basada en "
-"l'ordinador central del Protocol 2 de l'SSH."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 dubteu instal·leu-lo amb el SUID. Si us causa algun problema ho podeu "
-"modificar posteriorment executant l'ordre:  dpkg-reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Genera un fitxer de configuració nou"
@@ -217,6 +183,28 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Voleu que el fitxer ssh-keysign s'instal·li SUID root?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr "Podeu instal·lar l'ajudant del ssh-keysign amb el bit SUID definit."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Si definiu l'ssh-keysign SUID podreu utilitzat l'autenticació basada en "
+#~ "l'ordinador central del Protocol 2 de l'SSH."
+
+#~ 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 dubteu instal·leu-lo amb el SUID. Si us causa algun problema ho podeu "
+#~ "modificar posteriorment executant l'ordre:  dpkg-reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Permet únicament la versió 2 del protocol d'SSH"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 01f8c2591..858185ea2 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2005-03-09 18:29+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@@ -25,42 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Chcete ssh-keysign nainstalovat jako SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"M��ete si vybrat, zda chcete nainstalovat ssh-keysign s nastaven�m SUID "
-"bitem."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Pokud nastav�te ssh-keysign SUID, m��ete pou��vat 'host-based' autentizaci "
-"protokolu verze 2."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Pokud jste na pochyb�ch, doporu�ujeme SUID bit povolit. Pokud zaznamen�te "
-"probl�my, m��ete nastaven� zm�nit spu�t�n�m:   dpkg-reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Generovat nov� konfigura�n� soubor"
@@ -228,6 +192,30 @@ msgstr ""
 "nebude m�t volba 'PasswordAuthentication no' ��dn� efekt, pokud ov�em "
 "neuprav�te nastaven� PAM v /etc/pam.d/ssh."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Chcete ssh-keysign nainstalovat jako SUID root?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "M��ete si vybrat, zda chcete nainstalovat ssh-keysign s nastaven�m SUID "
+#~ "bitem."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Pokud nastav�te ssh-keysign SUID, m��ete pou��vat 'host-based' "
+#~ "autentizaci protokolu verze 2."
+
+#~ 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 ""
+#~ "Pokud jste na pochyb�ch, doporu�ujeme SUID bit povolit. Pokud zaznamen�te "
+#~ "probl�my, m��ete nastaven� zm�nit spu�t�n�m:   dpkg-reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Povolit pouze SSH protokol verze 2"
 
diff --git a/debian/po/da.po b/debian/po/da.po
index 233b731a0..6163a1e9d 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.8.1p1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-10-10 21:04+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -25,42 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Vil du have, at ssh-keysign bliver installeret 'SUID root'?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Du har mulighed for at installere ssh-keysign hjælperen med SUID-flaget sat."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Hvis du gør ssh-keysign SUID, vil du blive i stand til at benytte SSH "
-"protokol 2's værtsnavn-baserede autentifikation."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Hvis du er i tvivl, vil jeg råde dig til at installere den med SUID. Hvis "
-"det skaber problemer, kan du ændre det tilbage igen ved at køre: dpkg-"
-"reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Opret ny opsætningsfil"
@@ -232,6 +196,31 @@ msgstr ""
 "have nogen effekt, medmindre du også redigerer din PAM opsætning i /etc/pam."
 "d/ssh."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Vil du have, at ssh-keysign bliver installeret 'SUID root'?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "Du har mulighed for at installere ssh-keysign hjælperen med SUID-flaget "
+#~ "sat."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Hvis du gør ssh-keysign SUID, vil du blive i stand til at benytte SSH "
+#~ "protokol 2's værtsnavn-baserede autentifikation."
+
+#~ 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 ""
+#~ "Hvis du er i tvivl, vil jeg råde dig til at installere den med SUID. Hvis "
+#~ "det skaber problemer, kan du ændre det tilbage igen ved at køre: dpkg-"
+#~ "reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Tillad kun SSH protokol 2"
 
diff --git a/debian/po/de.po b/debian/po/de.po
index bc0d507a2..92737807e 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-05-30 09:49-0200\n"
 "Last-Translator: Helge Kreutzmann <kreutzm@itp.uni-hannover.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -26,43 +26,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "M�chten Sie ssh-keysign SUID-Root installieren?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Sie haben die M�glichkeit, den ssh-keysign-Helfer mit gesetzten SUID-Bit zu "
-"installieren."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Falls Sie ssh-keysign SUID installieren, k�nnen Sie die Host-basierende "
-"Authentisierung von SSH-Protokoll Version 2 verwenden."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Falls Sie unsicher sind, empfehle ich, mit SUID zu installieren. Falls es "
-"Probleme gibt, k�nnen Sie sp�ter Ihre Meinung �ndern, indem Sie dpkg-"
-"reconfigure ssh aufrufen."
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Erzeuge eine neue Konfigurationsdatei"
@@ -228,6 +191,31 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "M�chten Sie ssh-keysign SUID-Root installieren?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "Sie haben die M�glichkeit, den ssh-keysign-Helfer mit gesetzten SUID-Bit "
+#~ "zu installieren."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Falls Sie ssh-keysign SUID installieren, k�nnen Sie die Host-basierende "
+#~ "Authentisierung von SSH-Protokoll Version 2 verwenden."
+
+#~ 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 ""
+#~ "Falls Sie unsicher sind, empfehle ich, mit SUID zu installieren. Falls es "
+#~ "Probleme gibt, k�nnen Sie sp�ter Ihre Meinung �ndern, indem Sie dpkg-"
+#~ "reconfigure ssh aufrufen."
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Nur SSH-Protokoll Version 2 erlauben"
 
diff --git a/debian/po/el.po b/debian/po/el.po
index c9b4a1674..e7670b0db 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-10-14 21:34+0300\n"
 "Last-Translator: Logiotatidis George <seadog@sealabs.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -27,43 +27,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Θέλετε να εγκαταστήσετε το ssh-keysign ως SUID;"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Έχετε την επιλογή της εγκατάστασης του εργαλείου ssh-keysign με το bit SUID "
-"ενεργοποιημένο."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Αν εγκαταστήσετε το ssh-keysign SUID, θα μπορείτε να χρησιμοποιήσετε την "
-"πιστοποίηση υπολογιστή (host-based authentication) του πρωτοκόλου SSH 2."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Αν έχετε αμφιβολίες, συνιστάται να το εγκαταστήσετε SUID.  Αν διαπιστώσετε "
-"προβλήματα μπορείτε να αλλάξετε τη ρύθμιση αυτή εκτελώντας:  dpkg-"
-"reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Δημιουργία νέου αρχείου ρυθμίσεων"
@@ -243,6 +206,31 @@ msgstr ""
 "ενεργοποιημένο (προεπιλογή), τότε η επιλογή 'PasswordAuthetication no' δεν "
 "θα επιδρά εκτός και εάν ρυθμίσετε και το PAM στο αρχείο /etc/pam.d/ssh."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Θέλετε να εγκαταστήσετε το ssh-keysign ως SUID;"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "Έχετε την επιλογή της εγκατάστασης του εργαλείου ssh-keysign με το bit "
+#~ "SUID ενεργοποιημένο."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Αν εγκαταστήσετε το ssh-keysign SUID, θα μπορείτε να χρησιμοποιήσετε την "
+#~ "πιστοποίηση υπολογιστή (host-based authentication) του πρωτοκόλου SSH 2."
+
+#~ 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 ""
+#~ "Αν έχετε αμφιβολίες, συνιστάται να το εγκαταστήσετε SUID.  Αν "
+#~ "διαπιστώσετε προβλήματα μπορείτε να αλλάξετε τη ρύθμιση αυτή εκτελώντας:  "
+#~ "dpkg-reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Να επιτρέπεται μόνο η χρήση του πρωτοκόλλου SSH 2"
 
diff --git a/debian/po/es.po b/debian/po/es.po
index 2ca555efa..b73f939fd 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-10-12 00:00-0500\n"
 "Last-Translator: Santiago Erquicia <santiago_erquicia@yahoo.com.ar>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -42,42 +42,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "�Quiere instalar ssh-keysign SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Puede instalar ssh-keysign con el bit SUID (se ejecutar� con privilegios de "
-"root)."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Si hace ssh-keysign SUID, podr� usar la autenticaci�n basada en servidor de "
-"la versi�n 2 del protocolo SSH."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 le causa problemas puede "
-"cambiar de opini�n posteriormente ejecutando �dpkg-reconfigure ssh�."
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Generar un nuevo fichero de configuraci�n"
@@ -255,6 +219,30 @@ msgstr ""
 "omisi�n) entonces la opci�n �PasswordAuthentication no� no tendr� ninguna "
 "utilidad a menos que ajuste su configuraci�n de PAM en �/etc/pam.d/ssh�."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "�Quiere instalar ssh-keysign SUID root?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "Puede instalar ssh-keysign con el bit SUID (se ejecutar� con privilegios "
+#~ "de root)."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Si hace ssh-keysign SUID, podr� usar la autenticaci�n basada en servidor "
+#~ "de la versi�n 2 del protocolo SSH."
+
+#~ 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 le causa problemas puede "
+#~ "cambiar de opini�n posteriormente ejecutando �dpkg-reconfigure ssh�."
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Permitir s�lo la versi�n 2 del protocolo SSH"
 
diff --git a/debian/po/fi.po b/debian/po/fi.po
index bb88eb584..97b516943 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2005-04-08 22:15+0300\n"
 "Last-Translator: Matti Pöllä <mpo@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -28,40 +28,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Haluatko, että ssh-keygen asennetaan SUID root -oikeuksin?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "Voit valinnaisesti asentaa ssh-keysign-apuohjelman SUID-bitillä."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Jos SUID on päällä, voit käyttää SSH-protokollan version 2 konekohtaista \n"
-"todennusta."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Jos olet epävarma, SUID-bitin käyttämistä suositellaan. Jos se aiheuttaa \n"
-"ongelmia, voit myöhemmin muuttaa mielesi komennolla \"dpkg-reconfigure ssh\"."
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Luo uusi asetustiedosto"
@@ -238,6 +204,31 @@ msgstr ""
 "asetuksella \"PasswordAuthentication no\" ei ole vaikutusta, ellet muuta\n"
 "myös PAM-asetuksia tiedostossa /etc/pam.d/ssh."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Haluatko, että ssh-keygen asennetaan SUID root -oikeuksin?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr "Voit valinnaisesti asentaa ssh-keysign-apuohjelman SUID-bitillä."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Jos SUID on päällä, voit käyttää SSH-protokollan version 2 "
+#~ "konekohtaista \n"
+#~ "todennusta."
+
+#~ 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 ""
+#~ "Jos olet epävarma, SUID-bitin käyttämistä suositellaan. Jos se "
+#~ "aiheuttaa \n"
+#~ "ongelmia, voit myöhemmin muuttaa mielesi komennolla \"dpkg-reconfigure ssh"
+#~ "\"."
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Salli ainoastaan SSH-protokollan versio 2"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index e93c898ab..63b52d8a8 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.8.1p1-8.sarge.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-10-13 22:39+0200\n"
 "Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
 "Language-Team: French <Debian-l10n-french@lists.debian.org>\n"
@@ -25,41 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Faut-il installer ssh-keysign avec le bit SETUID activ�?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "Vous pouvez installer ssh-keysign avec le bit SETUID activ�."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Si vous choisissez cette option, vous permettrez l'authentification bas�e "
-"sur les h�tes, disponible dans la version 2 du protocole SSH."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Dans le doute, vous devriez l'installer avec le bit SETUID activ�. Si cela "
-"vous pose des probl�mes, vous pourrez revenir sur votre d�cision avec ��dpkg-"
-"reconfigure ssh��."
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Faut-il cr�er un nouveau fichier de configuration�?"
@@ -240,6 +205,29 @@ msgstr ""
 "��PasswordAuthentication no�� n'aura d'effet que si vous ajustez aussi la "
 "configuration de PAM dans /etc/pam.d/ssh."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Faut-il installer ssh-keysign avec le bit SETUID activ�?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr "Vous pouvez installer ssh-keysign avec le bit SETUID activ�."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Si vous choisissez cette option, vous permettrez l'authentification bas�e "
+#~ "sur les h�tes, disponible dans la version 2 du protocole SSH."
+
+#~ 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 ""
+#~ "Dans le doute, vous devriez l'installer avec le bit SETUID activ�. Si "
+#~ "cela vous pose des probl�mes, vous pourrez revenir sur votre d�cision "
+#~ "avec ��dpkg-reconfigure ssh��."
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Faut-il autoriser uniquement la version 2 du protocole SSH�?"
 
diff --git a/debian/po/it.po b/debian/po/it.po
index 036eceaf2..26e1d760d 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2003-12-21 12:23+0100\n"
 "Last-Translator: Renato Gini <rgini@openlabs.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -25,42 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Si desidera installare ssh-keysign come SUID-root?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Si ha la possibilit� di installare l'helper ssh-keysign con il bit SUID "
-"impostato."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Se si imposta ssh-keysign come SUID, sar� possibile usare l'autenticazione "
-"basata su host del protocollo 2 di SSH."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Nel dubbio, � consigliabile installarlo come SUID. Se ci� causa problemi "
-"sar� possibile cambiare idea successivamente eseguendo �dpkg-reconfigure ssh�"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Generare un nuovo file di configurazione"
@@ -231,6 +195,31 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Si desidera installare ssh-keysign come SUID-root?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "Si ha la possibilit� di installare l'helper ssh-keysign con il bit SUID "
+#~ "impostato."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Se si imposta ssh-keysign come SUID, sar� possibile usare "
+#~ "l'autenticazione basata su host del protocollo 2 di SSH."
+
+#~ 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 ""
+#~ "Nel dubbio, � consigliabile installarlo come SUID. Se ci� causa problemi "
+#~ "sar� possibile cambiare idea successivamente eseguendo �dpkg-reconfigure "
+#~ "ssh�"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Consentire solo il protocollo 2 di SSH"
 
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 73eb4a2d2..c8a93918e 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-10-20 08:53+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -25,42 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "ssh-keysign �� SUID root �ǥ��󥹥ȡ��뤷�ޤ���?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"ssh-keysign �إ�ѡ��򥤥󥹥ȡ��뤹��ݡ�SUID �ӥåȤ����ꤹ�뤫���ʤ�������"
-"�֤��Ȥ��Ǥ��ޤ���"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"ssh-keysign �� SUID �����ꤷ����硢SSH �ץ��ȥ��� 2 �Υۥ��Ȥ˴�Ť�ǧ�ڤ��"
-"�����Ȥ��Ǥ��ޤ���"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"�褯ʬ����ʤ����ϡ�SUID ��ͭ���ˤ��뤳�Ȥ򤪴��ᤷ�ޤ����⤷ ���꤬������"
-"�С�dpkg-reconfigure ssh ��¹Ԥ��뤳�Ȥ�������ѹ����뤳�Ȥ��Ǥ��ޤ���"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "����������ե��������ޤ�"
@@ -232,6 +196,30 @@ msgstr ""
 "�� PAM �����Ĵ�ᤷ�ʤ��¤ꡢ'PasswordAuthentication no' ���ץ����ϸ��̤��"
 "���ʤ��ʤ�ޤ���"
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "ssh-keysign �� SUID root �ǥ��󥹥ȡ��뤷�ޤ���?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "ssh-keysign �إ�ѡ��򥤥󥹥ȡ��뤹��ݡ�SUID �ӥåȤ����ꤹ�뤫���ʤ���"
+#~ "�����֤��Ȥ��Ǥ��ޤ���"
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "ssh-keysign �� SUID �����ꤷ����硢SSH �ץ��ȥ��� 2 �Υۥ��Ȥ˴�Ť�ǧ��"
+#~ "��Ȥ����Ȥ��Ǥ��ޤ���"
+
+#~ 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 ""
+#~ "�褯ʬ����ʤ����ϡ�SUID ��ͭ���ˤ��뤳�Ȥ򤪴��ᤷ�ޤ����⤷ ���꤬����"
+#~ "��С�dpkg-reconfigure ssh ��¹Ԥ��뤳�Ȥ�������ѹ����뤳�Ȥ��Ǥ��ޤ���"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "SSH �ץ��ȥ��� 2 �Τߤ���Ĥ��ޤ�"
 
diff --git a/debian/po/nl.po b/debian/po/nl.po
index a141b6b7b..0c467e061 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-10-28 23:21+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -25,44 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Wilt u ssh-keysign met SUID root installeren?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"U heeft de mogelijkheid om het ssh-keysign hulpprogramma te installeren met "
-"de SUID-bit aan."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Wanneer u de SUID-bit voor ssh-keysign aanzet, krijgt u de mogelijkheid om "
-"de computer-gebaseerde authenticatie van het versie 2 SSH-protocol te "
-"gebruiken."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Bij twijfel kunt u best met SUID installeren. Indien dit problemen "
-"veroorzaakt kunt u dit altijd later nog veranderen door \"dpkg-reconfigure "
-"ssh\" uit te voeren"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Genereer het nieuwe configuratiebestand"
@@ -243,6 +205,32 @@ msgstr ""
 "(de standaarwaarde) zal de 'PasswordAuthentication no' optie geen (nuttig) "
 "effect hebben tenzij u ook de PAM-configuratie aanpast in /etc/pam.d/ssh."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Wilt u ssh-keysign met SUID root installeren?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "U heeft de mogelijkheid om het ssh-keysign hulpprogramma te installeren "
+#~ "met de SUID-bit aan."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Wanneer u de SUID-bit voor ssh-keysign aanzet, krijgt u de mogelijkheid "
+#~ "om de computer-gebaseerde authenticatie van het versie 2 SSH-protocol te "
+#~ "gebruiken."
+
+#~ 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 ""
+#~ "Bij twijfel kunt u best met SUID installeren. Indien dit problemen "
+#~ "veroorzaakt kunt u dit altijd later nog veranderen door \"dpkg-"
+#~ "reconfigure ssh\" uit te voeren"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Laat enkel versie 2 van het SSH-protocol toe."
 
diff --git a/debian/po/pl.po b/debian/po/pl.po
index e2683ed19..a422e51a2 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-04-08 18:28+0200\n"
 "Last-Translator: Emil Nowak <emil5@go2.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -25,43 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Czy chcesz aby ssh-keysign by� zainstalowany jako SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Masz mo�liwo�� zainstalowania pomocniczego programu ssh-keysign z w��czonym "
-"bitem SETUID."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Je�li uczynisz ssh-keysign SUIDowym, b�dziesz m�g� u�ywa� opartej na hostach "
-"autoryzacji drugiej wersji protoko�u SSH."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Je�li masz w�tpliwo�ci, radz� zainstalowa� go z SUIDem. Je�li to sprawia "
-"problemy, mo�esz zmieni� swoje zdanie uruchamiaj�c p�niej polecenie: dpkg-"
-"reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Wygeneruj nowy plik konfiguracyjny"
@@ -227,6 +190,31 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Czy chcesz aby ssh-keysign by� zainstalowany jako SUID root?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "Masz mo�liwo�� zainstalowania pomocniczego programu ssh-keysign z "
+#~ "w��czonym bitem SETUID."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Je�li uczynisz ssh-keysign SUIDowym, b�dziesz m�g� u�ywa� opartej na "
+#~ "hostach autoryzacji drugiej wersji protoko�u SSH."
+
+#~ 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 ""
+#~ "Je�li masz w�tpliwo�ci, radz� zainstalowa� go z SUIDem. Je�li to sprawia "
+#~ "problemy, mo�esz zmieni� swoje zdanie uruchamiaj�c p�niej polecenie: "
+#~ "dpkg-reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Zezwalaj wy��cznie na wersj� 2 protoko�u SSH"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 09f8c941a..d855b0b0b 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh_3.6.1p2-9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2003-11-09 16:29-0300\n"
 "Last-Translator: Andr� Lu�s Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -25,43 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Deseja que que ssh-keysign seja instalado SUID root ?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Gerar novo arquivo de configura��o"
@@ -230,6 +193,31 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Deseja que que ssh-keysign seja instalado SUID root ?"
+
+#~ 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."
+
+#~ 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."
+
+#~ 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"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Permitir somente protocolo SSH vers�o 2"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 5bc209c66..b5117f4b1 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2003-10-02 17:20+0500\n"
 "Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
 "Language-Team: russian <ru@li.org>\n"
@@ -26,40 +26,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "������ ���������� ssh-keysign ��� SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "�� ������ ����������� ���������� ��� SUID ��� ������� ssh-keysign."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"���� �� ���������� ��� SUID ��� ssh, �� �� ������� ������������ �������� "
-"�������������� ��� SSH-��������� ������ 2."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"���� �� �� ������, ��� �������, �� ���������� ���������� SUID ��� ssh. � "
-"����������, �� ������ �������� ���� ����� ��������: dpkg-reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "������������� ����� ���������������� ����"
@@ -222,6 +188,28 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "������ ���������� ssh-keysign ��� SUID root?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr "�� ������ ����������� ���������� ��� SUID ��� ������� ssh-keysign."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "���� �� ���������� ��� SUID ��� ssh, �� �� ������� ������������ �������� "
+#~ "�������������� ��� SSH-��������� ������ 2."
+
+#~ 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 ""
+#~ "���� �� �� ������, ��� �������, �� ���������� ���������� SUID ��� ssh. � "
+#~ "����������, �� ������ �������� ���� ����� ��������: dpkg-reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "��������� ������������� ������ SSH-��������� ������ 2."
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 5691c66ac..77b943641 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03: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"
@@ -26,36 +26,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index bcd7b2c51..70f899ceb 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ssh\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-04-27 06:50+0300\n"
 "Last-Translator: Recai Oktaş <roktas@omu.edu.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -17,43 +17,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "ssh-keysign'ın root haklarıyla kurulmasını (SUID root) ister misiniz?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"ssh-keysign yardımcı aracının SUID bit'i etkinleştirilerek kurulması "
-"seçeneğine sahipsiniz."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Eğer ssh-keysign'ı SUID yaparsanız, SSH'ın makine tabanlı Protokol 2 "
-"yetkilendirmesini kullanabileceksiniz."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Bu konuda şüpheliyseniz, size SUID'li kurulumu öneririm. Eğer bu sorunlara "
-"yol açarsa ileride fikrinizi değiştirmek için şu komutu çalıştırabilirsiniz: "
-"dpkg-reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Yeni yapılandırma dosyası oluştur"
@@ -217,6 +180,32 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr ""
+#~ "ssh-keysign'ın root haklarıyla kurulmasını (SUID root) ister misiniz?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr ""
+#~ "ssh-keysign yardımcı aracının SUID bit'i etkinleştirilerek kurulması "
+#~ "seçeneğine sahipsiniz."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Eğer ssh-keysign'ı SUID yaparsanız, SSH'ın makine tabanlı Protokol 2 "
+#~ "yetkilendirmesini kullanabileceksiniz."
+
+#~ 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 ""
+#~ "Bu konuda şüpheliyseniz, size SUID'li kurulumu öneririm. Eğer bu "
+#~ "sorunlara yol açarsa ileride fikrinizi değiştirmek için şu komutu "
+#~ "çalıştırabilirsiniz: dpkg-reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Sadece SSH protokol 2'ye izin ver"
 
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 5df2912a4..9a5f552c4 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2005-03-28 22:28+0300\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -28,40 +28,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "Чи бажаєте ви, щоб ssh-keysign мав встановлений біт SUID?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "Ви маєте можливість встановити біт SUID для програми ssh-keysign."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Якщо ви встановите біт SUID для ssh-keysign, ви зможете використовувати "
-"вузлову автентифікацію протоколу SSH версії 2."
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"Якщо сумніваєтесь, то рекомендується дозволити встановити біт SUID. Якщо це "
-"викликатиме проблеми, ви зможете все змінити запустивши dpkg-reconfigure ssh"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Створити новий файл налаштувань"
@@ -233,6 +199,29 @@ msgstr ""
 "мати корисного ефекту доки ви не пристосуєте також налаштування PAM в /etc/"
 "pam.d/ssh."
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "Чи бажаєте ви, щоб ssh-keysign мав встановлений біт SUID?"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr "Ви маєте можливість встановити біт SUID для програми ssh-keysign."
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "Якщо ви встановите біт SUID для ssh-keysign, ви зможете використовувати "
+#~ "вузлову автентифікацію протоколу SSH версії 2."
+
+#~ 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 ""
+#~ "Якщо сумніваєтесь, то рекомендується дозволити встановити біт SUID. Якщо "
+#~ "це викликатиме проблеми, ви зможете все змінити запустивши dpkg-"
+#~ "reconfigure ssh"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "Дозволити тільки SSH-протокол версії 2"
 
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 113f5960b..8cd519837 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 02:47+0100\n"
+"POT-Creation-Date: 2005-05-31 03:26+0100\n"
 "PO-Revision-Date: 2004-02-02 18:48+1300\n"
 "Last-Translator: Hiei Xu <nicky@mail.edu.cn>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -25,40 +25,6 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-client.templates.master:4
-msgid "Do you want ssh-keysign to be installed SUID root?"
-msgstr "您要将 ssh-keysign 安装为 SUID root 程序吗？"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "您使用为 ssh-keysign 帮助者程序设置 SUID 位的选项。"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"如果您为 ssh-keysign 设置了 SUID，您将可以使用 SSH 协议 2 的基于主机的认证方"
-"式。"
-
-#. Type: boolean
-#. Description
-#: ../openssh-client.templates.master:4
-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 ""
-"如果有疑问，我建议您将它安装为 SUID。如果它带来麻烦，您可以通过运行：dpkg-"
-"reconfigure ssh 来改变主意"
-
-#. Type: boolean
-#. Description
 #: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "生成新的配置文件"
@@ -213,6 +179,28 @@ msgid ""
 "effect unless you also adjust your PAM configuration in /etc/pam.d/ssh."
 msgstr ""
 
+#~ msgid "Do you want ssh-keysign to be installed SUID root?"
+#~ msgstr "您要将 ssh-keysign 安装为 SUID root 程序吗？"
+
+#~ msgid ""
+#~ "You have the option of installing the ssh-keysign helper with the SUID "
+#~ "bit set."
+#~ msgstr "您使用为 ssh-keysign 帮助者程序设置 SUID 位的选项。"
+
+#~ msgid ""
+#~ "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 "
+#~ "host-based authentication."
+#~ msgstr ""
+#~ "如果您为 ssh-keysign 设置了 SUID，您将可以使用 SSH 协议 2 的基于主机的认证"
+#~ "方式。"
+
+#~ 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 ""
+#~ "如果有疑问，我建议您将它安装为 SUID。如果它带来麻烦，您可以通过运行：dpkg-"
+#~ "reconfigure ssh 来改变主意"
+
 #~ msgid "Allow SSH protocol 2 only"
 #~ msgstr "只允许 SSH 协议 2 (ssh2)。"
 
diff --git a/debian/rules b/debian/rules
index 90bd7ba9e..1538ef445 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,6 @@ ifeq ($(PO2DEBCONF),yes)
         # 4.1.16) depends on it), the binary-arch target will generate a
         # better version for sarge.
         echo 1 > debian/po/output
-        po2debconf debian/openssh-client.templates.master > debian/openssh-client.templates
         po2debconf debian/openssh-server.templates.master > debian/openssh-server.templates
         rm -f debian/po/output
 endif
@@ -171,9 +170,6 @@ binary-openssh-client: DH_OPTIONS=-popenssh-client
 binary-openssh-client: build install
         dh_testdir
         dh_testroot
-ifeq ($(PO2DEBCONF),yes)
-        po2debconf -e utf8 debian/openssh-client.templates.master > debian/openssh-client.templates
-endif
         dh_installdebconf
         dh_installdocs OVERVIEW README
         cat debian/copyright.head LICENCE > debian/openssh-client/usr/share/doc/openssh-client/copyright
@@ -181,6 +177,7 @@ endif
         dh_strip
         dh_compress
         dh_fixperms
+        chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign
         dh_installdeb
         test ! -e debian/ssh/etc/ssh/ssh_prng_cmds \
           || echo "/etc/ssh/ssh_prng_cmds" >> debian/openssh-client/DEBIAN/conffiles