* Split the ssh binary package into openssh-client and openssh-server

  (closes: #39741). openssh-server depends on openssh-client for some
  common functionality; it didn't seem worth creating yet another package
  for this.
* New transitional ssh package, depending on openssh-client and
  openssh-server. May be removed once nothing depends on it.
* When upgrading from ssh to openssh-{client,server}, it's very difficult
  for the maintainer scripts to find out what version we're upgrading from
  without dodgy dpkg hackery. I've therefore taken the opportunity to move
  a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
  and ssh/user_environment_tell.
* In general, upgrading to this version directly from woody without first
  upgrading to the version in sarge is not currently guaranteed to work
  very smoothly due to the aforementioned version discovery problems.

41 files changed, 2099 insertions, 2420 deletions

diff --git a/debian/.cvsignore b/debian/.cvsignore
index 1e2b2ac7e..9ec0ecde2 100644
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1,8 +1,11 @@
 files
-ssh-askpass-gnome
-templates
+tmp
+openssh-client
+openssh-server
+ssh
 openssh-client-udeb
 openssh-server-udeb
-ssh
+ssh-askpass-gnome
 *.debhelper
 *substvars
+*.templates
diff --git a/debian/changelog b/debian/changelog
index 2c157e7ad..671e5b495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+openssh (1:3.8.1p1-9) UNRELEASED; urgency=low
+
+  * Split the ssh binary package into openssh-client and openssh-server
+    (closes: #39741). openssh-server depends on openssh-client for some
+    common functionality; it didn't seem worth creating yet another package
+    for this.
+  * New transitional ssh package, depending on openssh-client and
+    openssh-server. May be removed once nothing depends on it.
+  * When upgrading from ssh to openssh-{client,server}, it's very difficult
+    for the maintainer scripts to find out what version we're upgrading from
+    without dodgy dpkg hackery. I've therefore taken the opportunity to move
+    a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
+    and ssh/user_environment_tell.
+  * In general, upgrading to this version directly from woody without first
+    upgrading to the version in sarge is not currently guaranteed to work
+    very smoothly due to the aforementioned version discovery problems.
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 31 Jul 2004 03:01:19 +0100
+
 openssh (1:3.8.1p1-8) unstable; urgency=high
 
   * Matthew Vernon:
diff --git a/debian/control b/debian/control
index 37899eb3c..d0080e8ec 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,41 @@ Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, li
 Standards-Version: 3.6.1
 Uploaders: Colin Watson <cjwatson@debian.org>
 
-Package: ssh
+Package: openssh-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0)
+Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0)
+Conflicts: sftp, rsh-client (<<0.16.1-1)
+Replaces: ssh (<< 1:3.8.1p1-9)
+Suggests: ssh-askpass, xbase-clients
+Provides: rsh-client, ssh-client
+Description: Secure shell client, an rlogin/rsh/rcp replacement
+ This is the portable version of OpenSSH, a free implementation of
+ the Secure Shell protocol as specified by the IETF secsh working
+ group.
+ .
+ Ssh (Secure Shell) is a program for logging into a remote machine
+ and for executing commands on a remote machine.
+ It provides secure encrypted communications between two untrusted
+ hosts over an insecure network.  X11 connections and arbitrary TCP/IP
+ ports can also be forwarded over the secure channel.
+ It is intended as a replacement for rlogin, rsh and rcp, and can be
+ used to provide applications with a secure communication channel.
+ .
+ This package provides the ssh client.
+ .
+ --------------------------------------------------------------------
+ .
+ In some countries it may be illegal to use any encryption at all
+ without a special permit.
+
+Package: openssh-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
 Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1)
+Replaces: ssh (<< 1:3.8.1p1-9)
 Suggests: ssh-askpass, xbase-clients
-Provides: rsh-client
-Description: Secure rlogin/rsh/rcp replacement (OpenSSH)
+Provides: ssh-server
+Description: Secure shell server, an rshd replacement
  This is the portable version of OpenSSH, a free implementation of
  the Secure Shell protocol as specified by the IETF secsh working
  group.
@@ -25,18 +53,26 @@ Description: Secure rlogin/rsh/rcp replacement (OpenSSH)
  It is intended as a replacement for rlogin, rsh and rcp, and can be
  used to provide applications with a secure communication channel.
  .
- This package provides both the ssh client and the sshd server.
+ This package provides the sshd server.
  .
  --------------------------------------------------------------------
  .
  In some countries it may be illegal to use any encryption at all
  without a special permit.
 
+Package: ssh
+Architecture: all
+Depends: openssh-client, openssh-server
+Description: Secure shell client and server (transitional package)
+ This is a transitional package depending on both the OpenSSH client and
+ the OpenSSH server, which are now in separate packages. You may remove
+ it once the upgrade is complete and nothing depends on it.
+
 Package: ssh-askpass-gnome
 Section: gnome
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ssh (>=1:1.2pre7-4) | ssh-krb5
+Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5
 Replaces: ssh (<< 1:3.5p1-3)
 Provides: ssh-askpass
 Description: under X, asks user for a passphrase for ssh-add
diff --git a/debian/openssh-client.NEWS b/debian/openssh-client.NEWS
new file mode 100644
index 000000000..25a62731d
--- /dev/null
+++ b/debian/openssh-client.NEWS
@@ -0,0 +1,8 @@
+ssh (1:3.0.1p1-1) unstable; urgency=high
+
+  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 backward
+  compatibility.
+
+ -- Matthew Vernon <matthew@debian.org>  Thu, 28 Nov 2001 17:43:01 +0000
diff --git a/debian/openssh-client.conffiles b/debian/openssh-client.conffiles
new file mode 100644
index 000000000..70b55c8f8
--- /dev/null
+++ b/debian/openssh-client.conffiles
@@ -0,0 +1,2 @@
+/etc/ssh/ssh_config
+/etc/ssh/moduli
diff --git a/debian/openssh-client.config b/debian/openssh-client.config
new file mode 100644
index 000000000..7490526fa
--- /dev/null
+++ b/debian/openssh-client.config
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+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
+
+db_go
+
+exit 0
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
new file mode 100644
index 000000000..2168dc1f1
--- /dev/null
+++ b/debian/openssh-client.postinst
@@ -0,0 +1,104 @@
+#!/bin/sh -e
+
+action="$1"
+oldversion="$2"
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+umask 022
+
+if [ "$action" != configure ]
+  then
+  exit 0
+fi
+
+
+fix_rsh_diversion() {
+# get rid of mistaken rsh diversion (circa 1.2.27-1)
+
+        if [ -L /usr/bin/rsh ] &&
+                dpkg-divert --list '/usr/bin/rsh.real/rsh' | grep -q ' ssh$' ; then
+                for cmd in rlogin  rsh rcp ; do
+                        [ -L /usr/bin/$cmd ] && rm /usr/bin/$cmd
+                        dpkg-divert --package ssh --remove --rename \
+                                --divert /usr/bin/rsh.real/$cmd /usr/bin/$cmd
+
+                        [ -L /usr/man/man1/$cmd.1.gz ] && rm /usr/man/man1/$$cmd.1.gz
+                        dpkg-divert --package ssh --remove --rename \
+                                --divert /usr/man/man1/$cmd.real.1.gz /usr/man/man1/$cmd.1.gz
+                done
+
+                rmdir /usr/bin/rsh.real
+        fi
+}
+
+create_alternatives() {
+# Create alternatives for the various r* tools.
+# Make sure we don't change existing alternatives that a user might have
+# changed, but clean up after some old alternatives that mistakenly pointed
+# rlogin and rcp to ssh.
+        update-alternatives --quiet --remove rlogin /usr/bin/ssh
+        update-alternatives --quiet --remove rcp /usr/bin/ssh
+        for cmd in rsh rlogin rcp; do
+                scmd="s${cmd#r}"
+                if ! update-alternatives --display "$cmd" | \
+                                grep -q "$scmd"; then
+                        update-alternatives --quiet --install "/usr/bin/$cmd" "$cmd" "/usr/bin/$scmd" 20 \
+                                --slave "/usr/share/man/man1/$cmd.1.gz" "$cmd.1.gz" "/usr/share/man/man1/$scmd.1.gz"
+                fi
+        done
+}
+
+set_ssh_permissions() {
+        if dpkg --compare-versions "$oldversion" lt-nl 1:3.4p1-1 ; then
+            if [ -x /usr/sbin/dpkg-statoverride ] ; then
+                if dpkg-statoverride --list /usr/bin/ssh >/dev/null; then
+                    dpkg-statoverride --remove /usr/bin/ssh >/dev/null
+                fi 
+            fi
+        fi
+
+        if [ ! -x /usr/sbin/dpkg-statoverride ] || \
+             ! dpkg-statoverride --list /usr/lib/ssh-keysign >/dev/null ; then
+                db_get ssh/SUID_client
+                if [ "$RET" = "false" ] ; then
+                        chmod 0755 /usr/lib/ssh-keysign
+                elif [ "$RET" = "true" ] ; then
+                        chmod 4755 /usr/lib/ssh-keysign
+                fi
+        fi
+}
+
+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 ssh >/dev/null; then
+                delgroup --quiet ssh || true
+        fi
+}
+
+set_ssh_agent_permissions() {
+        if ! getent group ssh >/dev/null; then
+                addgroup --system --quiet ssh
+        fi
+        if ! [ -x /usr/sbin/dpkg-statoverride ] || \
+            ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null ; then
+                chgrp ssh /usr/bin/ssh-agent
+                chmod 2755 /usr/bin/ssh-agent
+        fi
+}
+
+
+fix_rsh_diversion
+create_alternatives
+set_ssh_permissions
+if [ "$2" = "1:3.5p1-1" ]; then
+    fix_ssh_group
+fi
+set_ssh_agent_permissions
+
+
+db_stop
+
+exit 0
diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm
new file mode 100644
index 000000000..139fb4d12
--- /dev/null
+++ b/debian/openssh-client.postrm
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ]
+then
+    # Remove all non-conffiles that ssh might create, so that we can
+    # smoothly remove /etc/ssh if and only if the user hasn't dropped some
+    # other files in there. Conffiles have already been removed at this
+    # point.
+    rm -f /etc/ssh/moduli /etc/ssh/primes
+    rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2
+    rmdir --ignore-fail-on-non-empty /etc/ssh
+fi
+
+if [ "$1" = "purge" ] ; then
+        delgroup --quiet ssh > /dev/null || true
+fi
+
+exit 0
diff --git a/debian/prerm b/debian/openssh-client.prerm
index 5c1aa1351..2d631cb9c 100644
--- a/debian/prerm
+++ b/debian/openssh-client.prerm
@@ -20,17 +20,8 @@ case "$1" in
         update-alternatives --quiet --remove rsh /usr/bin/ssh
         update-alternatives --quiet --remove rlogin /usr/bin/slogin
         update-alternatives --quiet --remove rcp /usr/bin/scp
-        if [ -x /etc/init.d/ssh ]; then
-                if [ -x /usr/sbin/invoke-rc.d ]; then
-                        invoke-rc.d ssh stop
-                else
-                        /etc/init.d/ssh stop
-                fi
-        fi
-#       install-info --quiet --remove /usr/info/ssh-askpass.info.gz
         ;;
     upgrade)
-#       install-info --quiet --remove /usr/info/ssh-askpass.info.gz
         ;;
     failed-upgrade)
         ;;
diff --git a/debian/openssh-client.templates.master b/debian/openssh-client.templates.master
new file mode 100644
index 000000000..2a9594c66
--- /dev/null
+++ b/debian/openssh-client.templates.master
@@ -0,0 +1,12 @@
+Template: ssh/SUID_client
+Type: boolean
+Default: true
+_Description: Do you want /usr/lib/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/openssh-server.NEWS b/debian/openssh-server.NEWS
new file mode 100644
index 000000000..687adf955
--- /dev/null
+++ b/debian/openssh-server.NEWS
@@ -0,0 +1,12 @@
+ssh (1:3.5p1-1) unstable; urgency=low
+
+  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.
+
+  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.
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 26 Oct 2002 19:41:51 +0100
diff --git a/debian/conffiles b/debian/openssh-server.conffiles
index b5c7a47fc..c67a8f45a 100644
--- a/debian/conffiles
+++ b/debian/openssh-server.conffiles
@@ -1,5 +1,3 @@
-/etc/ssh/ssh_config
-/etc/ssh/moduli
 /etc/init.d/ssh
 /etc/pam.d/ssh
 /etc/default/ssh
diff --git a/debian/config b/debian/openssh-server.config
index b5cff528c..b40e8afd7 100644
--- a/debian/config
+++ b/debian/openssh-server.config
@@ -3,20 +3,10 @@
 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
 
-if [ -n "$version" ] && dpkg --compare-versions "$version" lt 1:3.0p1-1
-then
-  db_input medium ssh/ssh2_keys_merged
-fi
-
 if [ -e /etc/init.d/ssh ] && ! grep -q pidfile /etc/init.d/ssh
 then
   db_fset ssh/use_old_init_script seen false
@@ -47,18 +37,6 @@ then
     fi
 fi 
 
-db_input medium ssh/SUID_client || true
-
-# To be correct during initial installation, this relies on the desired
-# default for run_sshd being "true".
-if [ -e /etc/ssh/sshd_not_to_be_run ]
-then
-    db_set ssh/run_sshd false
-else
-    db_set ssh/run_sshd true
-fi
-db_input medium ssh/run_sshd || true
-
 if [ -x /usr/sbin/in.telnetd ] && grep -q "^telnet\b" /etc/inetd.conf
 then
   if ! /usr/sbin/in.telnetd -? 2>&1 | grep -q ssl 2>/dev/null
@@ -87,10 +65,6 @@ fi
 
 db_input low ssh/forward_warning || true
 
-if dpkg --compare-versions "$version" lt-nl 1:3.5p1-3; then
-    db_input high ssh/user_environment_tell || true
-fi
-
 db_go
 
 exit 0
diff --git a/debian/openssh-server.default b/debian/openssh-server.default
new file mode 100644
index 000000000..304042224
--- /dev/null
+++ b/debian/openssh-server.default
@@ -0,0 +1,5 @@
+# Default settings for openssh-server. This file is sourced by /bin/sh from
+# /etc/init.d/ssh.
+
+# Options to pass to sshd
+SSHD_OPTS=
diff --git a/debian/dirs b/debian/openssh-server.dirs
index 1496845fc..3d434da75 100644
--- a/debian/dirs
+++ b/debian/openssh-server.dirs
@@ -1,8 +1,6 @@
-usr/bin
-usr/sbin
-usr/lib
-etc/ssh
 etc/init.d
 etc/default
-usr/share/man/man1
+usr/lib
+usr/sbin
 usr/share/man/man8
+var/run/sshd
diff --git a/debian/init b/debian/openssh-server.init
index 552330422..552330422 100644
--- a/debian/init
+++ b/debian/openssh-server.init
diff --git a/debian/postinst b/debian/openssh-server.postinst
index 1baae1677..64f9985a8 100644
--- a/debian/postinst
+++ b/debian/openssh-server.postinst
@@ -14,7 +14,6 @@ if [ "$action" != configure ]
 fi
 
 
-
 check_idea_key() {
     #check for old host_key files using IDEA, which openssh does not support
         if [ -f /etc/ssh/ssh_host_key ] ; then
@@ -207,27 +206,6 @@ UsePAM yes
 EOF
 }
 
-
-fix_rsh_diversion() {
-# get rid of mistaken rsh diversion (circa 1.2.27-1)
-
-        if [ -L /usr/bin/rsh ] &&
-                dpkg-divert --list '/usr/bin/rsh.real/rsh' | grep -q ' ssh$' ; then
-                for cmd in rlogin  rsh rcp ; do
-                        [ -L /usr/bin/$cmd ] && rm /usr/bin/$cmd
-                        dpkg-divert --package ssh --remove --rename \
-                                --divert /usr/bin/rsh.real/$cmd /usr/bin/$cmd
-
-                        [ -L /usr/man/man1/$cmd.1.gz ] && rm /usr/man/man1/$$cmd.1.gz
-                        dpkg-divert --package ssh --remove --rename \
-                                --divert /usr/man/man1/$cmd.real.1.gz /usr/man/man1/$cmd.1.gz
-                done
-
-                rmdir /usr/bin/rsh.real
-        fi
-}
-
-
 fix_statoverride() {
 # Remove an erronous override for sshd (we should have overridden ssh)
         if [ -x /usr/sbin/dpkg-statoverride ]; then
@@ -237,93 +215,18 @@ fix_statoverride() {
         fi
 }
 
-
-create_alternatives() {
-# Create alternatives for the various r* tools.
-# Make sure we don't change existing alternatives that a user might have
-# changed, but clean up after some old alternatives that mistakenly pointed
-# rlogin and rcp to ssh.
-        update-alternatives --quiet --remove rlogin /usr/bin/ssh
-        update-alternatives --quiet --remove rcp /usr/bin/ssh
-        for cmd in rsh rlogin rcp; do
-                scmd="s${cmd#r}"
-                if ! update-alternatives --display "$cmd" | \
-                                grep -q "$scmd"; then
-                        update-alternatives --quiet --install "/usr/bin/$cmd" "$cmd" "/usr/bin/$scmd" 20 \
-                                --slave "/usr/share/man/man1/$cmd.1.gz" "$cmd.1.gz" "/usr/share/man/man1/$scmd.1.gz"
-                fi
-        done
-}
-
 setup_sshd_user() {
         if ! getent passwd sshd >/dev/null; then
                 adduser --quiet --system --no-create-home --home /var/run/sshd sshd
         fi
 }
 
-set_sshd_permissions() {
-        if dpkg --compare-versions "$oldversion" lt-nl 1:3.4p1-1 ; then
-            if [ -x /usr/sbin/dpkg-statoverride ] ; then
-                if dpkg-statoverride --list /usr/bin/ssh >/dev/null; then
-                    dpkg-statoverride --remove /usr/bin/ssh >/dev/null
-                fi 
-            fi
-        fi
-
-        if [ ! -x /usr/sbin/dpkg-statoverride ] || \
-             ! dpkg-statoverride --list /usr/lib/ssh-keysign >/dev/null ; then
-                db_get ssh/SUID_client
-                if [ "$RET" = "false" ] ; then
-                        chmod 0755 /usr/lib/ssh-keysign
-                elif [ "$RET" = "true" ] ; then
-                        chmod 4755 /usr/lib/ssh-keysign
-                fi
-        fi
-}
-
-
-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 ssh >/dev/null; then
-                delgroup --quiet ssh || true
-        fi
-}
-
-
-set_ssh_agent_permissions() {
-        if ! getent group ssh >/dev/null; then
-                addgroup --system --quiet ssh
-        fi
-        if ! [ -x /usr/sbin/dpkg-statoverride ] || \
-            ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null ; then
-                chgrp ssh /usr/bin/ssh-agent
-                chmod 2755 /usr/bin/ssh-agent
-        fi
-}
-
-
 fix_conffile_permissions() {
         # Clean up after executable /etc/default/ssh in 1:3.5p1-5. dpkg
         # doesn't do this for us; see bug #192981.
         chmod 644 /etc/default/ssh
 }
 
-setup_startup() {
-        db_get ssh/run_sshd
-        if [ "$RET" = "false" ] ; then
-                if [ -x /usr/sbin/invoke-rc.d ]; then
-                        invoke-rc.d --quiet ssh stop
-                else
-                        /etc/init.d/ssh stop
-                fi
-                touch /etc/ssh/sshd_not_to_be_run
-        else
-                rm -f /etc/ssh/sshd_not_to_be_run 2>/dev/null
-        fi
-}
-
-
 setup_init() {
         if [ -x /etc/init.d/ssh ]; then
                 update-rc.d ssh defaults >/dev/null
@@ -335,26 +238,18 @@ setup_init() {
         fi
 }
 
+
 create_sshdconfig
 check_idea_key
 create_keys
-fix_rsh_diversion
 fix_statoverride
-create_alternatives
 setup_sshd_user
-set_sshd_permissions
-if [ "$2" = "1:3.5p1-1" ]; then
-    fix_ssh_group
-fi
-set_ssh_agent_permissions
 if dpkg --compare-versions "$2" lt 1:3.6.1p2-2; then
     fix_conffile_permissions
 fi
-setup_startup
 setup_init
 
 
 db_stop
 
 exit 0
-
diff --git a/debian/postrm b/debian/openssh-server.postrm
index 73eeeb463..862c51520 100644
--- a/debian/postrm
+++ b/debian/openssh-server.postrm
@@ -8,13 +8,10 @@ then
     # smoothly remove /etc/ssh if and only if the user hasn't dropped some
     # other files in there. Conffiles have already been removed at this
     # point.
-    rm -f /etc/ssh/moduli /etc/ssh/primes
     rm -f /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub
     rm -f /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
     rm -f /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub
-    rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2
     rm -f /etc/ssh/sshd_config
-    rm -f /etc/ssh/sshd_not_to_be_run
     rmdir --ignore-fail-on-non-empty /etc/ssh
 fi
 
@@ -24,7 +21,6 @@ fi
 
 if [ "$1" = "purge" ] ; then
         deluser --quiet sshd > /dev/null || true
-        delgroup --quiet ssh > /dev/null || true
 fi
 
 exit 0
diff --git a/debian/preinst b/debian/openssh-server.preinst
index e22d0aa5d..320d4df2a 100644
--- a/debian/preinst
+++ b/debian/openssh-server.preinst
@@ -3,11 +3,11 @@
 action=$1
 version=$2
 
-if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
+if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
   version=1.2.27
 fi
 
-if [ "$action" = upgrade ] || [ "$action" = install ]
+if [ "$action" = upgrade -o "$action" = install ]
 then
   # check if debconf is missing
   if ! test -f /usr/share/debconf/confmodule
@@ -39,7 +39,7 @@ EOF
     # work around for missing debconf
     db_get() { : ; }
     RET=true
-    if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
+    if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
       cp -a /etc/ssh-nonfree /etc/ssh
     fi
   else
diff --git a/debian/openssh-server.prerm b/debian/openssh-server.prerm
new file mode 100644
index 000000000..7bc080b9d
--- /dev/null
+++ b/debian/openssh-server.prerm
@@ -0,0 +1,43 @@
+#! /bin/sh
+# prerm script for ssh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    remove|deconfigure)
+        if [ -x /etc/init.d/ssh ]; then
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d ssh stop
+                else
+                        /etc/init.d/ssh stop
+                fi
+        fi
+        ;;
+    upgrade)
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/ssh.pam b/debian/openssh-server.ssh.pam
index 8882053df..8882053df 100644
--- a/debian/ssh.pam
+++ b/debian/openssh-server.ssh.pam
diff --git a/debian/templates.master b/debian/openssh-server.templates.master
index 07f62b178..e6d355639 100644
--- a/debian/templates.master
+++ b/debian/openssh-server.templates.master
@@ -32,14 +32,6 @@ _Description: Allow SSH protocol 2 only
  If you later change your mind about this setting, README.Debian has
  instructions on what to do to your sshd_config file.
 
-Template: ssh/ssh2_keys_merged
-Type: note
-_Description: ssh2 keys merged in configuration files
- 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
-
 Template: ssh/use_old_init_script
 Type: boolean
 Default: false
@@ -85,41 +77,3 @@ _Description: Warning: you must create a new host key
  from the old (non-free) SSH installation.
  .
  You will need to generate a new host key.
-
-Template: ssh/SUID_client
-Type: boolean
-Default: true
-_Description: Do you want /usr/lib/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
-
-Template: ssh/run_sshd
-Type: boolean
-Default: true
-_Description: Do you want to run the sshd server?
- This package contains both the ssh client, and the sshd server.
- .
- Normally the sshd Secure Shell Server will be run to allow remote logins
- via ssh.
- .
- 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 can disable sshd here.
-
-Template: ssh/user_environment_tell
-Type: note
-_Description: Environment options on keys have been deprecated
- 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.
- .
- 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.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 302e5538b..292dced6e 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1,2 @@
-[type: gettext/rfc822deb] templates.master
+[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 412555d19..19d590977 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +16,47 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Voleu que el fitxer /usr/lib/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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -38,7 +72,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -55,7 +89,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -64,13 +98,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Permet únicament la versió 2 del protocol d'SSH"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -85,7 +119,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -96,7 +130,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -104,28 +138,9 @@ msgstr ""
 "Si posteriorment canvieu d'opinió respecte a la configuració, podeu trobar "
 "les instruccions per modificar el fitxer sshd_config a README.Debian."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "S'han combinat les claus de l'ssh2 als fitxers de configuració"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Des de la versió 3 de l'OpenSSH ja no s'utilitzaran fitxers separats per les "
-"claus de l'ssh1 i ssg2. Ja no caldran els fitxer authorized_keys2 i "
-"known_hosts2. Es continuaran llegint per mantenir la compatibilitat amb les "
-"versions anteriors."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 "Esteu segur de voler continuar (tot i la possibilitat d'aturar les sessions "
@@ -133,7 +148,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -145,7 +160,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -155,7 +170,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "Nota: les opcions de reenviament de les X11 i autorització estan "
@@ -163,7 +178,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -173,7 +188,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -183,13 +198,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Podeu trobar més informació al fitxer /usr/share/doc/ssh/README.Debian"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Avís: el servidor rsh-server està instal·lat --- probablement no sigui una "
@@ -197,7 +212,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -207,14 +222,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Avís: el telnetd està instal·lat --- probablement no sigui una bona idea"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -228,13 +243,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Avís: heu de crear una nova clau del servidor central"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -246,105 +261,64 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Haureu de generar una nova clau de l'ordinador central."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "Voleu que el fitxer /usr/lib/ssh-keysign s'instal·li SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Voleu executar el servidor d'sshd?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "El paquet conté el client i el servidor d'ssh."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"L'sshd (servidor de l'intèrpret d'ordres segur) s'executarà, normalment, per "
-"permetre l'entrada remota a través de l'ssh."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Podeu inhabilitar l'sshd si voleu utilitzar el client d'ssh únicament per "
-"connexions a l'exterior i no per acceptar connexions remotes."
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "S'ha prohibit les opcions d'entorn a les claus."
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"L'OpenSSH inhabilita, per defecte i per evitar diversos atacs (per exemple "
-"LD_PRELOAD), les opcions d'entorn per les claus públiques. Si utilitzeu "
-"aquesta opció al fitxer authorized_keys recordeu que les claus de la qüestió "
-"no funcionaran fins que no se suprimeixi l'opció."
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Per tornar a habilitar l'opció definiu \"PermitUserEnvironment yes\" al "
-"fitxer /etc/ssh/sshd_config al finalitzar l'actualització (recordeu la nota "
-"d'avís de la pàgina del manual sshd_config(5)). "
+#~ msgid "ssh2 keys merged in configuration files"
+#~ msgstr "S'han combinat les claus de l'ssh2 als fitxers de configuració"
+
+#~ 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 ""
+#~ "Des de la versió 3 de l'OpenSSH ja no s'utilitzaran fitxers separats per "
+#~ "les claus de l'ssh1 i ssg2. Ja no caldran els fitxer authorized_keys2 i "
+#~ "known_hosts2. Es continuaran llegint per mantenir la compatibilitat amb "
+#~ "les versions anteriors."
+
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Voleu executar el servidor d'sshd?"
+
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "El paquet conté el client i el servidor d'ssh."
+
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "L'sshd (servidor de l'intèrpret d'ordres segur) s'executarà, normalment, "
+#~ "per permetre l'entrada remota a través de l'ssh."
+
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Podeu inhabilitar l'sshd si voleu utilitzar el client d'ssh únicament per "
+#~ "connexions a l'exterior i no per acceptar connexions remotes."
+
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "S'ha prohibit les opcions d'entorn a les claus."
+
+#~ 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 ""
+#~ "L'OpenSSH inhabilita, per defecte i per evitar diversos atacs (per "
+#~ "exemple LD_PRELOAD), les opcions d'entorn per les claus públiques. Si "
+#~ "utilitzeu aquesta opció al fitxer authorized_keys recordeu que les claus "
+#~ "de la qüestió no funcionaran fins que no se suprimeixi l'opció."
+
+#~ 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 ""
+#~ "Per tornar a habilitar l'opció definiu \"PermitUserEnvironment yes\" al "
+#~ "fitxer /etc/ssh/sshd_config al finalitzar l'actualització (recordeu la "
+#~ "nota d'avís de la pàgina del manual sshd_config(5)). "
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 071003350..617f7d98d 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2004-01-28 15:10+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@@ -25,13 +25,49 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Chcete /usr/lib/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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -47,7 +83,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -62,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -70,13 +106,13 @@ msgstr "Je v�ele doporu�eno nechat m� vyrobit konfigura�n� soubor."
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Povolit pouze SSH protokol verze 2"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -90,7 +126,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -100,7 +136,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -108,33 +144,15 @@ msgstr ""
 "Pokud se pozd�ji rozhodnete jinak, v README.Debian se nach�z� p�esn� n�vod, "
 "jak upravit soubor sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "Kl��e ssh2 v konfigura�n�ch souborech byly spojeny"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"OpenSSH verze 3 ji� nepou��v� odd�len� soubory pro kl��e verze ssh1 a ssh2. "
-"To znamen�, �e soubory authorized_keys2 a known_hosts2 ji� nejsou pot�eba, "
-"ov�em z d�vod� zachov�n� zp�tn� kompatibility jsou st�le na��t�ny."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Chcete pokra�ovat (a riskovat ukon�en� aktivn�ch ssh spojen�)?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -146,7 +164,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -156,13 +174,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "POZN�MKA: Autorizace a p�esm�rov�n� X11 je standardn� vypnuto."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -172,7 +190,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -182,19 +200,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "V�ce naleznete v /usr/share/doc/ssh/README.Debian"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Varov�n�: je nainstalov�n rsh-server --- to nen� dobr� n�pad"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -204,13 +222,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Varov�n�: je nainstalov�n telnetd --- to nen� dobr� n�pad"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -223,13 +241,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Varov�n�: mus�te vytvo�it nov� serverov� kl��"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -241,110 +259,67 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Mus�te vygenerovat nov� serverov� kl��"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "Chcete /usr/lib/ssh-keysign nainstalovat jako SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "Kl��e ssh2 v konfigura�n�ch souborech byly spojeny"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "OpenSSH verze 3 ji� nepou��v� odd�len� soubory pro kl��e verze ssh1 a "
+#~ "ssh2. To znamen�, �e soubory authorized_keys2 a known_hosts2 ji� nejsou "
+#~ "pot�eba, ov�em z d�vod� zachov�n� zp�tn� kompatibility jsou st�le "
+#~ "na��t�ny."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Chcete spustit sshd server?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Chcete spustit sshd server?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Tento bal�k obsahuje jak klienta ssh, tak server sshd."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Tento bal�k obsahuje jak klienta ssh, tak server sshd."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Obvykle se sshd (Secure Shell Server) spou�t�, aby se vzd�len� u�ivatel� "
-"mohli p�ihla�ovat p�es ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Obvykle se sshd (Secure Shell Server) spou�t�, aby se vzd�len� u�ivatel� "
+#~ "mohli p�ihla�ovat p�es ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Pokud na tomto po��ta�i chcete vyu��vat pouze ssh klienta pro odchoz� "
-"spojen�, m��ete zde sshd zak�zat."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Pokud na tomto po��ta�i chcete vyu��vat pouze ssh klienta pro odchoz� "
+#~ "spojen�, m��ete zde sshd zak�zat."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Volby prost�ed� spojen� s kl��i jsou zak�z�ny"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Volby prost�ed� spojen� s kl��i jsou zak�z�ny"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Pro zamezen� ur�it�ch typ� �tok� (nap�. LD_PRELOAD), tato verze OpenSSH "
-"standardn� zabra�uje pou��vat volbu prost�ed� u ve�ejn�ch kl���. Pokud tuto "
-"volbu pou��v�te v souboru authorized_keys, tak posti�en� kl��e nebudou "
-"fungovat, dokud jim tuto volbu nesma�ete."
+#~ 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 ""
+#~ "Pro zamezen� ur�it�ch typ� �tok� (nap�. LD_PRELOAD), tato verze OpenSSH "
+#~ "standardn� zabra�uje pou��vat volbu prost�ed� u ve�ejn�ch kl���. Pokud "
+#~ "tuto volbu pou��v�te v souboru authorized_keys, tak posti�en� kl��e "
+#~ "nebudou fungovat, dokud jim tuto volbu nesma�ete."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Pro znovupovolen� t�to volby si po aktualizaci p�e�t�te varov�n� v manu�lov� "
-"str�nce sshd_config(5) a v souboru /etc/ssh/sshd_config zadejte "
-"\"PermitUserEnvironment yes\"."
+#~ 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 ""
+#~ "Pro znovupovolen� t�to volby si po aktualizaci p�e�t�te varov�n� v "
+#~ "manu�lov� str�nce sshd_config(5) a v souboru /etc/ssh/sshd_config zadejte "
+#~ "\"PermitUserEnvironment yes\"."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Odd�len� privilegi�"
diff --git a/debian/po/da.po b/debian/po/da.po
index be90f82f3..6eb87ece2 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2003-10-28 14:30+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
 "Language-Team: debian-l10n-danish <debian-l10n-danish@lists.debian.org>\n"
@@ -25,13 +25,49 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+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'?"
+
+#. 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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -47,7 +83,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -63,7 +99,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -71,13 +107,13 @@ msgstr "Du rådes stærkt til at lade mig oprette en ny opsætningsfil for dig."
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Tillad kun SSH protokol 2"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -91,7 +127,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -102,7 +138,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -110,34 +146,15 @@ msgstr ""
 "Hvis du senere ændrer din mening om denne indstilling, har README.Debian "
 "instruktioner på hvad du skal gøre ved din sshd_config fil."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "ssh2-nøgler flettet i opsætningsfilerne"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Siden version 3 har OpenSSH ikke længere separate filer for ssh1- og ssh2-"
-"nøgler. Det betyder, at filerne authorized_keys2 og known_hosts2 ikke "
-"længere er nødvendige. De vil stadig dog stadig blive læst for "
-"bagudkompatilitetens skyld."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Vil du fortsætte (og risikere at afbryde aktive ssh-forbindelser)?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -149,7 +166,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -159,14 +176,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "BEMÆRK: Videregivelse af X11 og adgangkontrol er som standard deaktiveret."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -176,7 +193,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -186,19 +203,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Flere detaljer kan findes i /usr/share/doc/ssh/README.Debian"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Advarsel: rsh-serveren er installeret --- sikkert ikke en god idé"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -209,13 +226,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Advarsel: telnetd er installeret --- sikkert ikke en god idé"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -229,13 +246,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Advarsel: du skal oprette en ny værtsnøgle"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -247,111 +264,68 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Du skal oprette en ny værtsnøgle."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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'?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "ssh2-nøgler flettet i opsætningsfilerne"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "Siden version 3 har OpenSSH ikke længere separate filer for ssh1- og ssh2-"
+#~ "nøgler. Det betyder, at filerne authorized_keys2 og known_hosts2 ikke "
+#~ "længere er n��dvendige. De vil stadig dog stadig blive læst for "
+#~ "bagudkompatilitetens skyld."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Vil du køre sshd-serveren?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Vil du køre sshd-serveren?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Denne pakke indeholder både ssh-klienten og sshd-serveren."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Denne pakke indeholder både ssh-klienten og sshd-serveren."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normalt vil sshd sikker skalserver ('Secure Shell Server') blive aktiveret "
-"og tillade fjerne brugere i at logge på via ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normalt vil sshd sikker skalserver ('Secure Shell Server') blive "
+#~ "aktiveret og tillade fjerne brugere i at logge på via ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Hvis du udelukkende er interesseret i at bruge ssh-klienten til udgående "
-"forbindelser fra denne maskine, og ikke ønsker at tilgå denne maskine udefra "
-"via ssh, kan du nu deaktivere sshd."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Hvis du udelukkende er interesseret i at bruge ssh-klienten til udgående "
+#~ "forbindelser fra denne maskine, og ikke ønsker at tilgå denne maskine "
+#~ "udefra via ssh, kan du nu deaktivere sshd."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Miljø-variabler for nøgler er ikke længere understøttet"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Miljø-variabler for nøgler er ikke længere understøttet"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Denne version af OpenSSH deaktiverer miljø-variabler for offentlige nøgler "
-"soms tandard, for at undgå angreb (f.eks., LD_PRELOAD). Hvis du bruger denne "
-"mulighed i en authorized_keys fil, så skal du bemærke at nøglerne ikke "
-"længere vil virke før miljø-variablen er blevet slettet."
+#~ 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 ""
+#~ "Denne version af OpenSSH deaktiverer miljø-variabler for offentlige "
+#~ "nøgler soms tandard, for at undgå angreb (f.eks., LD_PRELOAD). Hvis du "
+#~ "bruger denne mulighed i en authorized_keys fil, så skal du bemærke at "
+#~ "nøglerne ikke længere vil virke før miljø-variablen er blevet slettet."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"For at re-aktivere denne muligt, sæt \"PermitUserEnvironment yes\" i /etc/"
-"ssh/sshd_config efter opgraderingen er færdig, men bemærk advarslen som står "
-"skrevet i sshd_config(5) manual-siden."
+#~ 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 ""
+#~ "For at re-aktivere denne muligt, sæt \"PermitUserEnvironment yes\" i /etc/"
+#~ "ssh/sshd_config efter opgraderingen er færdig, men bemærk advarslen som "
+#~ "står skrevet i sshd_config(5) manual-siden."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Privilegie adskillelse"
diff --git a/debian/po/de.po b/debian/po/de.po
index 85546e7c1..17526f287 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +26,50 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "M�chten Sie /usr/lib/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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +85,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -65,7 +102,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -75,13 +112,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Nur SSH-Protokoll Version 2 erlauben"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -96,7 +133,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -107,7 +144,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -115,35 +152,16 @@ msgstr ""
 "Falls Sie sp�ter Ihre Meinung �ber diese Einstellung �ndern, finden Sie in "
 "README.Debian eine Anleitung was Sie mit der sshd_config-Datei machen m�ssen."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "ssh2-Schl�ssel in die Konfigurationsdateien eingef�gt"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Mit Version 3 verwendet OpenSSH nicht mehr seperate Dateien f�r ssh1 und "
-"ssh2 Schl�ssel. Dies bedeutet, da� authorized_keys2 und known_hosts2 nicht "
-"mehr ben�tigt werden. Sie werden noch eingelesen, um Abw�rtskompatibilit�t "
-"zu gew�hren."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 "Wollen Sie weitermachen (und das Beenden der aktiven Sitzung riskieren)?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -155,7 +173,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -166,13 +184,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "HINWEIS: Weiterleiten von X11 und Berechtigungen ist abgeschaltet."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -182,7 +200,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -192,19 +210,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Weitere Details k�nnen Sie in /usr/share/doc/ssh/README.Debian finden."
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Warnung: rsh-server ist installiert --- wahrscheinlich keine gute Idee"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -214,13 +232,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Warnung: telnetd ist installiert --- wahrscheinlich keine gute Idee"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -233,13 +251,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Warnung: Sie m�ssen einen neuen Host-Schl�ssel erzeugen"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -252,110 +270,67 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Sie m�ssen einen neuen Host-Schl�ssel erzeugen."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "M�chten Sie /usr/lib/ssh-keysign SUID-Root installieren?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "M�chten Sie den sshd Server starten?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normalerweise wird der sshd Secure Shell Server f�r Remote Logins per "
-"sshgestartet."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Wenn Sie nur den ssh client nutzen wollen, um sich mit anderen Rechnern zu "
-"verbinden, und sich nicht per ssh in diesen Computer einloggen wollen, dann "
-"k�nnen Sie hier den sshd abschalten."
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Umgebungs-Optionen f�r Schl�ssel wurden missbilligt"
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Diese Version von OpenSSH deaktiviert standardm��ig die Umgebungsoption "
-"f�r�ffentliche Schl�ssel um bestimmte Angriffe (zum Beispiel �ber "
-"LD_PRELOAD) zu vermeiden. Falls Sie diese Option in einer authorized_keys-"
-"Datei verwenden, beachten Sie, da� die in Frage kommenden Schl�ssel nicht "
-"funktionieren werden bis diese Option entfernt wurde."
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Um diese Option wieder zu reaktivieren, setzen Sie, unter Ber�cksichtigung "
-"der Warnung in der sshd_config(5)-Handbuchseite, \"PermitUserEnvironment yes"
-"\" in /etc/ssh/sshd_config nachdem die Aktualisierung erfolgt ist."
+#~ msgid "ssh2 keys merged in configuration files"
+#~ msgstr "ssh2-Schl�ssel in die Konfigurationsdateien eingef�gt"
+
+#~ 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 ""
+#~ "Mit Version 3 verwendet OpenSSH nicht mehr seperate Dateien f�r ssh1 und "
+#~ "ssh2 Schl�ssel. Dies bedeutet, da� authorized_keys2 und known_hosts2 "
+#~ "nicht mehr ben�tigt werden. Sie werden noch eingelesen, um "
+#~ "Abw�rtskompatibilit�t zu gew�hren."
+
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "M�chten Sie den sshd Server starten?"
+
+#~ 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."
+
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normalerweise wird der sshd Secure Shell Server f�r Remote Logins per "
+#~ "sshgestartet."
+
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Wenn Sie nur den ssh client nutzen wollen, um sich mit anderen Rechnern "
+#~ "zu verbinden, und sich nicht per ssh in diesen Computer einloggen wollen, "
+#~ "dann k�nnen Sie hier den sshd abschalten."
+
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Umgebungs-Optionen f�r Schl�ssel wurden missbilligt"
+
+#~ 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 ""
+#~ "Diese Version von OpenSSH deaktiviert standardm��ig die Umgebungsoption "
+#~ "f�r�ffentliche Schl�ssel um bestimmte Angriffe (zum Beispiel �ber "
+#~ "LD_PRELOAD) zu vermeiden. Falls Sie diese Option in einer authorized_keys-"
+#~ "Datei verwenden, beachten Sie, da� die in Frage kommenden Schl�ssel nicht "
+#~ "funktionieren werden bis diese Option entfernt wurde."
+
+#~ 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 ""
+#~ "Um diese Option wieder zu reaktivieren, setzen Sie, unter "
+#~ "Ber�cksichtigung der Warnung in der sshd_config(5)-Handbuchseite, "
+#~ "\"PermitUserEnvironment yes\" in /etc/ssh/sshd_config nachdem die "
+#~ "Aktualisierung erfolgt ist."
diff --git a/debian/po/el.po b/debian/po/el.po
index cdc7a21fc..4a67e7116 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2004-02-15 14:14EEST\n"
 "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -27,13 +27,50 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Θέλετε να εγκαταστήσετε το /usr/lib/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 "Δημιουργία νέου αρχείου ρυθμίσεων"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -51,7 +88,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -68,7 +105,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -76,13 +113,13 @@ msgstr "Συνιστάται να επιλέξετε την δημιουργία
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Να επιτρέπεται μόνο η χρήση του πρωτοκόλλου SSH 2"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -97,7 +134,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -108,7 +145,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -116,35 +153,16 @@ msgstr ""
 "Αν αποφασίσετε διαφορετικά αργότερα για αυτή τη ρύθμιση, το αρχείο README."
 "Debian έχει οδηγίες για την κατάλληλη τροποποίηση του αρχείου sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "Τα κλειδιά ssh2 συγχωνεύτηκαν στα αρχεία ρυθμίσεων"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Από την έκδοση 3 και έπειτα, το OpenSSH δεν χρησιμοποιεί πλέον ξεχωριστά "
-"αρχεία για τα κλειδιά των ssh1 και ssh2. Αυτό σημαίνει ότι τα αρχεία "
-"authorized_keys2 και known_hosts2 δεν είναι πλέον απαραίτητα. Θα "
-"χρησιμοποιούνται μόνο για λόγους συμβατότητας."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 "Θέλετε να συνεχίσετε (με κίνδυνο τερματισμού των ενεργών συνεδριών ssh);"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -156,7 +174,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -166,7 +184,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "ΣΗΜΕΙΩΣΗ: Η προώθηση των πακέτων X11 και πιστοποίησης είναι "
@@ -174,7 +192,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -184,7 +202,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -194,7 +212,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο /usr/share/doc/ssh/"
@@ -202,14 +220,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Προσοχή: είναι ήδη εγκατεστημένος ο rsh-server --- όχι και τοσο καλή ιδέα"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -220,13 +238,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Προσοχή: είναι ήδη εγκατεστημένος ο telnetd --- όχι και τοσο καλή ιδέα"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -241,14 +259,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr ""
 "Προσοχή: πρέπει να δημιουργήσετε ένα νέο κλειδί για τον υπολογιστή (host key)"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -261,114 +279,73 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Πρέπει να δημιουργήσετε ένα νέο κλειδί για τον υπολογιστή (host key)."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "Θέλετε να εγκαταστήσετε το /usr/lib/ssh-keysign ως SUID;"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Έχετε την επιλογή της εγκατάστασης του εργαλείου ssh-keysign με το bit SUID "
-"ενεργοποιημένο."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "Τα κλειδιά ssh2 συγχωνεύτηκαν στα αρχεία ρυθμίσεων"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "Από την έκδοση 3 και έπειτα, το OpenSSH δεν χρησιμοποιεί πλέον ξεχωριστά "
+#~ "αρχεία για τα κλειδιά των ssh1 και ssh2. Αυτό σημαίνει ότι τα αρχεία "
+#~ "authorized_keys2 ��α�� known_hosts2 ��ε�� ε����α�� πλ������ α����ρ������ητ��. ��α "
+#~ "χρησιμοποιούνται μόνο για λόγους συμβατότητας."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Θέλετε να εκτελέσετε τον δαίμονα sshd;"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Θέλετε να εκτελέσετε τον δαίμονα sshd;"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Το πακέτο αυτό περιέχει το πελάτη ssh και το δαίμονα sshd."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Το πακέτο αυτό περιέχει το πελάτη ssh και το δαίμονα sshd."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Κανονικά ο δαίμονας sshd (Δαίμονας Ασφαλούς Κελύφους) θα εκτελείται για "
-"απομακρυσμένες συνδέσεις μέσω ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Κανονικά ο δαίμονας sshd (Δαίμονας Ασφαλούς Κελύφους) θα εκτελείται για "
+#~ "απομακρυσμένες συνδέσεις μέσω ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Αν ενδιαφέρεστε μόνο για τη χρήση του πελάτη ssh για εξερχόμενες συνδέσεις "
-"από αυτόν τον υπολογιστή και δεν επιθυμείτε να συνδέεστε σε αυτόν μέσω ssh, "
-"τότε μπορείτε να απενεργοποιήσετε τον sshd στο σημείο αυτό."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Αν ενδιαφέρεστε μόνο για τη χρήση του πελάτη ssh για εξερχόμενες "
+#~ "συνδέσεις από αυτόν τον υπολογιστή και δεν επιθυμείτε να συνδέεστε σε "
+#~ "αυτόν μέσω ssh, τότε μπορείτε να απενεργοποιήσετε τον sshd στο σημείο "
+#~ "αυτό."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr ""
-"Οι επιλογές περιβάλλοντος κελύφους για τα κλειδιά είναι πλέον παρωχημένες."
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr ""
+#~ "Οι επιλογές περιβάλλοντος κελύφους για τα κλειδιά είναι πλέον παρωχημένες."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Αυτή η έκδοση του OpenSSH απενεργοποιεί τις επιλογές περιβάλλοντος κελύφους "
-"για δημόσια κλειδιά εξ ορισμού, ώστε να αποφευχθούν ορισμένου τύπου "
-"επιθέσεις (για παράδειγμα, LD_PRELOAD). Αν χρησιμοποιείτε αυτήν την επιλογή "
-"σε ένα αρχείο authorized_keys, έχετε υπόψιν σας ότι τα συγκεκριμένα κλειδιά "
-"δεν θα χρησιμοποιούνται έως ότου αφαιρεθεί η επιλογή αυτή."
+#~ 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 ""
+#~ "Αυτή η έκδοση του OpenSSH απενεργοποιεί τις επιλογές περιβάλλοντος "
+#~ "κελύφους για δημόσια κλειδιά εξ ορισμού, ώστε να αποφευχθούν ορισμένου "
+#~ "τύπου επιθέσεις (για παράδειγμα, LD_PRELOAD). Αν χρησιμοποιείτε αυτήν την "
+#~ "επιλογή σε ένα αρχείο authorized_keys, έχετε υπόψιν σας ότι τα "
+#~ "συγκεκριμένα κλειδιά δεν θα χρησιμοποιούνται έως ότου αφαιρεθεί η επιλογή "
+#~ "αυτή."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Για να επανενεργοποιήσετε αυτήν την επιλογή, ορίστε \"PermitUserEnvironment "
-"yes\" στο αρχείο /etc/ssh/sshd_config μετά το τέλος της αναβάθμισης, έχοντας "
-"υπόψιν την προειδοποίηση στη σελίδα οδηγιών του sshd_config(5)."
+#~ 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 ""
+#~ "Για να επανενεργοποιήσετε αυτήν την επιλογή, ορίστε "
+#~ "\"PermitUserEnvironment yes\" στο αρχείο /etc/ssh/sshd_config μετά το "
+#~ "τέλος της αναβάθμισης, έχοντας υπόψιν την προειδοποίηση στη σελίδα "
+#~ "οδηγιών του sshd_config(5)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Διαχωρισμός Προνομίων"
diff --git a/debian/po/es.po b/debian/po/es.po
index 95a76b09d..84b290e0a 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2004-01-17 17:47+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino Pe�a <jfs@computer.org>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -42,13 +42,49 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "�Quiere instalar /usr/lib/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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -65,7 +101,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -82,7 +118,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -92,13 +128,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir s�lo la versi�n 2 del protocolo SSH"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -112,7 +148,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -123,7 +159,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -131,34 +167,15 @@ msgstr ""
 "Si m�s tarde cambia de opini�n, el fichero README.Debian contiene "
 "instrucciones sobre c�mo modificar en el fichero sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "Las claves ssh2 ya se incluyen en los ficheros de configuraci�n"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 de la versi�n 3, OpenSSH ya no utiliza ficheros diferentes para las "
-"claves ssh1 y ssh2. Esto quiere decir que ya no son necesarios los ficheros "
-"authorized_keys2 y known_hosts2, aunque a�n se seguir�n leyendo para "
-"mantener compatibilidad hacia atr�s."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -170,7 +187,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -180,13 +197,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "NOTA: Reenv�o de X11 y Autorizaci�n desactivadas por defecto."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -196,7 +213,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -206,20 +223,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 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."
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Aviso: tiene rsh-server instalado (seguramente, esto no es una buena idea)"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -230,13 +247,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: tiene telnetd instalado (posiblemente no es una buena idea)"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -250,13 +267,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: debe crear una nueva clave para su servidor"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -268,111 +285,69 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Necesitar� generar una nueva clave para su servidor."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "�Quiere instalar /usr/lib/ssh-keysign SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "Las claves ssh2 ya se incluyen en los ficheros de configuraci�n"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 de la versi�n 3, OpenSSH ya no utiliza ficheros diferentes para "
+#~ "las claves ssh1 y ssh2. Esto quiere decir que ya no son necesarios los "
+#~ "ficheros authorized_keys2 y known_hosts2, aunque a�n se seguir�n leyendo "
+#~ "para mantener compatibilidad hacia atr�s."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "�Quiere ejecutar el servidor sshd?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "�Quiere ejecutar el servidor sshd?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Este paquete contiene el cliente ssh y el servidor sshd."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Este paquete contiene el cliente ssh y el servidor sshd."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Generalmente, el servidor de ssh (Secure Shell Server) se ejecuta para "
-"permitir el acceso remoto mediante ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Generalmente, el servidor de ssh (Secure Shell Server) se ejecuta para "
+#~ "permitir el acceso remoto mediante ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Si s�lo est� interesado en usar el cliente ssh en conexiones salientes del "
-"sistema y no quiere acceder a �l mediante ssh, entonces puede desactivar "
-"sshd."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Si s�lo est� interesado en usar el cliente ssh en conexiones salientes "
+#~ "del sistema y no quiere acceder a �l mediante ssh, entonces puede "
+#~ "desactivar sshd."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Las opciones de entorno para las claves, en desuso"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Las opciones de entorno para las claves, en desuso"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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."
+#~ 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."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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)."
+#~ 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)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Separaci�n de privilegios"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 2d7523e26..6c6ecfaab 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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"
@@ -25,13 +25,52 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+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�?"
+
+#. 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 avez la possibilit� d'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 mettez ssh-keysign avec le bit SETUID, 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, je vous sugg�re de 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 "Cr�er un nouveau fichier de configuration"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +87,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -66,7 +105,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -76,13 +115,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Autoriser la version 2 du protocole SSH uniquement"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -97,7 +136,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -108,7 +147,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -117,35 +156,16 @@ msgstr ""
 "instructions fournies dans le fichier README.Debian vous indiquent comment "
 "modifier le fichier sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "Cl�s pour ssh2 fusionn�es dans les fichiers de configuration"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"OpenSSH, depuis sa version 3, n'utilise plus de fichiers distincts pour les "
-"cl�s ssh1 et ssh2. Cela signifie que les fichiers authorized_keys2 et "
-"known_hosts2 ne sont plus utiles. Ils seront n�anmoins lus afin de pr�server "
-"la compatibilit� descendante."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 "Voulez-vous continuer (et risquer de rompre les sessions ssh actives)�?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -157,7 +177,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -168,14 +188,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 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."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -185,7 +205,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -196,14 +216,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 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."
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Attention�: rsh-server est install� -- ce n'est probablement pas une bonne "
@@ -211,7 +231,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -222,14 +242,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Attention�: telnetd est install� -- ce n'est probablement pas une bonne id�e"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -243,13 +263,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Attention�: vous devez cr�er une nouvelle cl� d'h�te"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -261,115 +281,69 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Vous aurez besoin de g�n�rer une nouvelle cl� d'h�te."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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�?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Vous avez la possibilit� d'installer ssh-keysign avec le bit SETUID activ�."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Si vous mettez ssh-keysign avec le bit SETUID, vous permettrez "
-"l'authentification bas�e sur les h�tes, disponible dans la version 2 du "
-"protocole SSH."
+#~ msgid "ssh2 keys merged in configuration files"
+#~ msgstr "Cl�s pour ssh2 fusionn�es dans les fichiers de configuration"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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, je vous sugg�re de 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 ""
+#~ "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 ""
+#~ "OpenSSH, depuis sa version 3, n'utilise plus de fichiers distincts pour "
+#~ "les cl�s ssh1 et ssh2. Cela signifie que les fichiers authorized_keys2 et "
+#~ "known_hosts2 ne sont plus utiles. Ils seront n�anmoins lus afin de "
+#~ "pr�server la compatibilit� descendante."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Voulez-vous utiliser le serveur sshd�?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Voulez-vous utiliser le serveur sshd�?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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."
+#~ 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."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normalement le serveur sshd est lanc� pour permettre les connexions "
-"distantes via ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normalement le serveur sshd est lanc� pour permettre les connexions "
+#~ "distantes via ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Si vous d�sirez seulement utiliser le client ssh pour des connexions vers "
-"l'ext�rieur, ou si vous ne voulez pas vous connecter sur cette machine via "
-"ssh, vous pouvez d�sactiver sshd maintenant."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Si vous d�sirez seulement utiliser le client ssh pour des connexions vers "
+#~ "l'ext�rieur, ou si vous ne voulez pas vous connecter sur cette machine "
+#~ "via ssh, vous pouvez d�sactiver sshd maintenant."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Les options d'environnement sur les cl�s sont d�conseill�es"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Les options d'environnement sur les cl�s sont d�conseill�es"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"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 "
-"certaines attaques (par exemple, LD_PRELOAD). Si vous utilisez cette option "
-"dans un fichier ��authorized_keys��, sachez que les cl�s concern�es ne "
-"fonctionneront plus tant que l'option ne sera pas retir�e."
+#~ 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 ""
+#~ "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 "
+#~ "certaines attaques (par exemple, LD_PRELOAD). Si vous utilisez cette "
+#~ "option dans un fichier ��authorized_keys��, sachez que les cl�s "
+#~ "concern�es ne fonctionneront plus tant que l'option ne sera pas retir�e."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Pour la r�activer, veuillez indiquer �PermitUserEnvironment yes�� dans /etc/"
-"ssh/sshd_config lorsque la mise � niveau est termin�e. Veuillez tenir compte "
-"de l'avertissement donn� dans la page de manuel sshd_config(5)."
+#~ 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 ""
+#~ "Pour la r�activer, veuillez indiquer �PermitUserEnvironment yes�� dans /"
+#~ "etc/ssh/sshd_config lorsque la mise � niveau est termin�e. Veuillez tenir "
+#~ "compte de l'avertissement donn� dans la page de manuel sshd_config(5)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "S�paration des privil�ges"
diff --git a/debian/po/it.po b/debian/po/it.po
index 5e3e738e2..b827e9883 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +25,49 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Si desidera installare /usr/lib/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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +84,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -66,7 +102,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -76,13 +112,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Consentire solo il protocollo 2 di SSH"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -97,7 +133,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -108,7 +144,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -116,35 +152,16 @@ msgstr ""
 "Se successivamente si cambier� idea su questa impostazione, nel file README."
 "Debian sono presenti istruzioni sulle modifiche da fare nel file sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "chiavi ssh2 aggiunte nei file di configurazione"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Dalla versione 3 OpenSSH non usa pi� file separati per le chiavi ssh1 e "
-"ssh2. Ci� comporta che i file authorized_keys2 e known_hosts2 non sono pi� "
-"necessari. Essi verranno comunque letti al fine di mantenere la "
-"compatibilit� all'indietro."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 "Si desidera continuare (e rischiare di terminare le sessioni ssh attive)?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -157,7 +174,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -167,7 +184,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "NOTA: Forwarding di X11 e Authorization sono disabilitati come impostazione "
@@ -175,7 +192,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -185,7 +202,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -195,20 +212,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Maggiori dettagli si trovano in /usr/share/doc/ssh/README.Debian"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Attenzione: rsh-server � installato --- probabilmente non � una buona idea"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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,14 +235,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Attenzione: telnetd � installato --- probabilmente non � una buona idea"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -239,13 +256,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Attenzione: � necessario creare una nuova chiave host"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -258,112 +275,69 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Sar� necessario generare una nuova chiave host."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "Si desidera installare /usr/lib/ssh-keysign come SUID-root?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "chiavi ssh2 aggiunte nei file di configurazione"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "Dalla versione 3 OpenSSH non usa pi� file separati per le chiavi ssh1 e "
+#~ "ssh2. Ci� comporta che i file authorized_keys2 e known_hosts2 non sono "
+#~ "pi� necessari. Essi verranno comunque letti al fine di mantenere la "
+#~ "compatibilit� all'indietro."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Si desidera avviare il server sshd?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Si desidera avviare il server sshd?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Questo pacchetto contiene sia il client ssh che il server sshd."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Questo pacchetto contiene sia il client ssh che il server sshd."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normalmente il \"Secure Shell Server\" sshd verr� attivato per permettere "
-"connessioni remote attraverso ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normalmente il \"Secure Shell Server\" sshd verr� attivato per permettere "
+#~ "connessioni remote attraverso ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Se si � unicamente interessati all'uso del client ssh per connessioni in "
-"uscita da questo computer e non si vuole che ci si possa collegare usando "
-"ssh, sshd pu� essere disabilitato."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Se si � unicamente interessati all'uso del client ssh per connessioni in "
+#~ "uscita da questo computer e non si vuole che ci si possa collegare usando "
+#~ "ssh, sshd pu� essere disabilitato."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Le opzioni di ambiente sulle chiavi sono state deprecate"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Le opzioni di ambiente sulle chiavi sono state deprecate"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Questa versione di OpenSSH disabilita l'opzione di ambiente per le chiavi "
-"pubbliche, come impostazione predefinita, al fine di evitare certi attacchi "
-"(per esempio LD_PRELOAD). Se si sta usando questa opzione in un file "
-"authorized_keys, occorre fare attenzione al fatto che le chiavi in questione "
-"non funzioneranno pi� finch� l'opzione sar� rimossa."
+#~ 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 ""
+#~ "Questa versione di OpenSSH disabilita l'opzione di ambiente per le chiavi "
+#~ "pubbliche, come impostazione predefinita, al fine di evitare certi "
+#~ "attacchi (per esempio LD_PRELOAD). Se si sta usando questa opzione in un "
+#~ "file authorized_keys, occorre fare attenzione al fatto che le chiavi in "
+#~ "questione non funzioneranno pi� finch� l'opzione sar� rimossa."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Per riabilitare questa opzione, impostare \"PermitUserEnvironment yes\" nel "
-"file /etc/ssh/sshd_config dopo l'aggiornamento, considerando gli "
-"avvertimenti contenuti nella pagina del manuale sshd_config(5)."
+#~ 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 ""
+#~ "Per riabilitare questa opzione, impostare \"PermitUserEnvironment yes\" "
+#~ "nel file /etc/ssh/sshd_config dopo l'aggiornamento, considerando gli "
+#~ "avvertimenti contenuti nella pagina del manuale sshd_config(5)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Separazione dei privilegi"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 35527b294..0baefcc8e 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2003-09-24 09:32+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -25,13 +25,49 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "/usr/bin/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 "����������ե��������ޤ�"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +84,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -63,7 +99,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -71,13 +107,13 @@ msgstr "����������ե������ư�������뤳�Ȥ򶯤������ᤷ�ޤ���"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "SSH �ץ��ȥ��� 2 �Τߤ���Ĥ��ޤ�"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -91,7 +127,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -101,7 +137,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -109,33 +145,15 @@ msgstr ""
 "�⤷���夢�ʤ����ͤ����Ѥ����顢README.Debian ���ɤ�� sshd_config ��ɤΤ褦"
 "���ѹ�������褤����ʬ����ޤ���"
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "ssh2 ����������ե���������礵��ޤ�"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"OpenSSH �ΥС������ 3 �ϡ�ssh1 �� ssh2 �Υ����˸��̤Υե������Ȥ��ޤ���"
-"�Ĥޤꡢauthorized_keys2 �ե������ known_hosts2 �ե�����Ϥ�Ϥ����פȤʤ��"
-"�����������ߴ������ݤĤ���ˤϤ����Υե����뤬ɬ�פǤ���"
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "³���Ƥ褤�Ǥ��� (��³��� ssh ���å�����ڤ�뤫�⤷��ޤ���)"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -147,7 +165,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -157,13 +175,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "����: X11 ��ǧ�ڤΥե���ǥ��󥰤ϥǥե���ȤǤ϶ػߤ���ޤ�"
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -173,7 +191,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -183,20 +201,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "�ܺ٤� /usr/share/doc/ssh/README.Debian ���ɤ�Ǥ���������"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "�ٹ�: rsh-server �����󥹥ȡ��뤵��Ƥ��ޤ������֤��ɤ��ͤ��ǤϤ���ޤ���"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -207,13 +225,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "�ٹ�: telnetd �����󥹥ȡ��뤵��Ƥ��ޤ������֤��ɤ��ͤ��ǤϤ���ޤ���"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -227,13 +245,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "�ٹ�: �������ۥ��ȥ�������ʤ��Ȥ����ޤ���"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -245,111 +263,68 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "�������ۥ��ȥ�������ɬ�פ�����ޤ���"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "/usr/bin/ssh-keysign �� SUID root �ǥ��󥹥ȡ��뤷�ޤ���?"
+#~ msgid "ssh2 keys merged in configuration files"
+#~ msgstr "ssh2 ����������ե���������礵��ޤ�"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"ssh-keysign �إ�ѡ��򥤥󥹥ȡ��뤹��ݡ�SUID �ӥåȤ����ꤹ�뤫���ʤ�������"
-"�֤��Ȥ��Ǥ��ޤ���"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "OpenSSH �ΥС������ 3 �ϡ�ssh1 �� ssh2 �Υ����˸��̤Υե������Ȥ��ޤ�"
+#~ "�󡣤Ĥޤꡢauthorized_keys2 �ե������ known_hosts2 �ե�����Ϥ�Ϥ�����"
+#~ "�Ȥʤ�ޤ����������ߴ������ݤĤ���ˤϤ����Υե����뤬ɬ�פǤ���"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "sshd �����Ф�¹Ԥ��ޤ���?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "sshd �����Ф�¹Ԥ��ޤ���?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "���Υѥå������ϡ�ssh ���饤����Ȥ� sshd �����Ф�ξ����ޤ�Ǥ��ޤ���"
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr ""
+#~ "���Υѥå������ϡ�ssh ���饤����Ȥ� sshd �����Ф�ξ����ޤ�Ǥ��ޤ���"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"�̾sshd �����奢�����륵���Фϡ�ssh ���Ѥ�����⡼�Ȥ���Υ���������ǽ��"
-"���뤿��˼¹Ԥ��ޤ���"
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "�̾sshd �����奢�����륵���Фϡ�ssh ���Ѥ�����⡼�Ȥ���Υ���������"
+#~ "ǽ�ˤ��뤿��˼¹Ԥ��ޤ���"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"�⤷ ssh ���饤����Ȥ�ȤäƤ��Υޥ��󤫤�¾�ޥ���ؤ���³��������ǡ����Υ�"
-"����ؤ� ssh ��Ȥäƥ������󤷤ʤ��ΤǤ����顢������ sshd ��¹Ԥ��ʤ��Ǥ���"
-"�ޤ���"
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "�⤷ ssh ���饤����Ȥ�ȤäƤ��Υޥ��󤫤�¾�ޥ���ؤ���³��������ǡ���"
+#~ "�Υޥ���ؤ� ssh ��Ȥäƥ������󤷤ʤ��ΤǤ����顢������ sshd ��¹Ԥ���"
+#~ "���Ǥ����ޤ���"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "���δĶ����ץ�����̵�������ꤵ��ޤ���"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "���δĶ����ץ�����̵�������ꤵ��ޤ���"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"�ܥС������� OpenSSH �ϡ��������δĶ����ץ�����ǥե���Ȥ�̵�������ꤷ��"
-"���ޤ���LD_PRELOAD �ʤɤι�����򤱤뤿��Ǥ����⤷ authorized_keys �ե�����"
-"�Ǥ��Υ��ץ�������Ѥ��Ƥ����硢���Υ��ץ��������ʤ��¤�Ϥ��θ���"
-"���ѤǤ��ʤ����Ȥ����դ��Ƥ���������"
+#~ 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 ""
+#~ "�ܥС������� OpenSSH �ϡ��������δĶ����ץ�����ǥե���Ȥ�̵��������"
+#~ "���Ƥ��ޤ���LD_PRELOAD �ʤɤι�����򤱤뤿��Ǥ����⤷ authorized_keys "
+#~ "�ե�����Ǥ��Υ��ץ�������Ѥ��Ƥ����硢���Υ��ץ��������ʤ��¤�"
+#~ "�Ϥ��θ������ѤǤ��ʤ����Ȥ����դ��Ƥ���������"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"���Υ��ץ�����Ƥ�ͭ���ˤ���ˤϡ����åץ��졼�ɽ�λ��ˡ�sshd_config(5) ��"
-"�˥奢��ڡ����ηٹ������ɤ�ǡ� /etc/ssh/sshd_config �ե������"
-"��PermitUserEnvironment yes�פ����ꤷ�Ƥ���������"
+#~ 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 ""
+#~ "���Υ��ץ�����Ƥ�ͭ���ˤ���ˤϡ����åץ��졼�ɽ�λ��ˡ�sshd_config"
+#~ "(5) �ޥ˥奢��ڡ����ηٹ������ɤ�ǡ� /etc/ssh/sshd_config �ե������"
+#~ "��PermitUserEnvironment yes�פ����ꤷ�Ƥ���������"
 
 #~ msgid "Privilege separation"
 #~ msgstr "�ø���ʬΥ"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index e3fbdfc72..40bca6356 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2003-09-27 14:43+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -25,13 +25,51 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Wilt u /usr/lib/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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +86,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -65,7 +103,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -75,13 +113,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Laat enkel versie 2 van het SSH-protocol toe."
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -95,7 +133,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -106,7 +144,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -114,34 +152,15 @@ msgstr ""
 "Instructies over wat te veranderen in sshd_config om deze instelling later "
 "nog te veranderen, vindt u in /usr/share/doc/ssh/README.Debian.gz."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "ssh2 sleutels zijn samengevoegd in de configuratiebestanden"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Vanaf versie 3 gebruikt OpenSSH niet langer aparte bestanden om ssh1 en ssh2 "
-"sleutels bij te houden. Dit betekend dat de authorized_keys2 en known_hosts2 "
-"bestanden niet langer nodig zijn. Wel worden ze nog steeds gelezen om "
-"achterwaartse compabiliteit te behouden."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Wilt u verder gaan (waarbij u mogelijk actieve ssh sessies afschiet)?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -153,7 +172,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -163,14 +182,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "OPMERKING: Doorsturen van X11 en Authorisatie is standaard uitgeschakeld."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -180,7 +199,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -190,13 +209,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Meer details vindt u in /usr/share/doc/ssh/README.Debian.gz"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Waarschuwing: rsh-server is ge�nstalleerd -- dit is waarschijnlijk geen goed "
@@ -204,7 +223,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -215,7 +234,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Waarschuwing: telnetd is ge�nstalleerd -- dit is waarschijnlijk geen goed "
@@ -223,7 +242,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -237,13 +256,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Waarschuwing: u dient een nieuwe computersleutel aan te maken"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -255,116 +274,72 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Het zal nodig zijn om een nieuwe computersleutel te genereren"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "Wilt u /usr/lib/ssh-keysign met SUID root installeren?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "ssh2 sleutels zijn samengevoegd in de configuratiebestanden"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "Vanaf versie 3 gebruikt OpenSSH niet langer aparte bestanden om ssh1 en "
+#~ "ssh2 sleutels bij te houden. Dit betekend dat de authorized_keys2 en "
+#~ "known_hosts2 bestanden niet langer nodig zijn. Wel worden ze nog steeds "
+#~ "gelezen om achterwaartse compabiliteit te behouden."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Wilt u de sshd server opstarten?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Wilt u de sshd server opstarten?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Dit pakket bevat zowel de ssh-client, als de sshd-server."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Dit pakket bevat zowel de ssh-client, als de sshd-server."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normaal wordt de sshd-server uitgevoerd om aanmelden vanop een andere "
-"computer via ssh toe te laten."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normaal wordt de sshd-server uitgevoerd om aanmelden vanop een andere "
+#~ "computer via ssh toe te laten."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Indien u op deze machine enkel ssh wil gebruiken voor uitgaande "
-"verbindingen, en ook lokaal niet wilt inloggen via ssh, kunt u sshd hier "
-"uitschakelen."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Indien u op deze machine enkel ssh wil gebruiken voor uitgaande "
+#~ "verbindingen, en ook lokaal niet wilt inloggen via ssh, kunt u sshd hier "
+#~ "uitschakelen."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr ""
-"Omgevingsopties voor sleutels zullen in de toekomst niet meer ondersteund "
-"worden."
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr ""
+#~ "Omgevingsopties voor sleutels zullen in de toekomst niet meer ondersteund "
+#~ "worden."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Deze versie van OpenSSH schakelt de omgevingsoptie voor publieke sleutels "
-"standaard uit om bepaalde aanvallen uit te sluiten (bv. LD_PRELOAD). Indien "
-"u deze optie in een authorized_keys-bestand gebruikt, dient u u ervan bewust "
-"te zijn dat de betreffende sleutels niet langer zullen werken totdat de "
-"optie verwijderd wordt."
+#~ 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 ""
+#~ "Deze versie van OpenSSH schakelt de omgevingsoptie voor publieke sleutels "
+#~ "standaard uit om bepaalde aanvallen uit te sluiten (bv. LD_PRELOAD). "
+#~ "Indien u deze optie in een authorized_keys-bestand gebruikt, dient u u "
+#~ "ervan bewust te zijn dat de betreffende sleutels niet langer zullen "
+#~ "werken totdat de optie verwijderd wordt."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Om deze optie opnieuw in te schakelen dient u \"PermitUserEnvironment yes\" "
-"in /etc/ssh/sshd_config aan te zetten in nadat de opwaardering compleet is; "
-"houd hierbij rekening met de waarschuwing in de sshd_config(5) man-pagina."
+#~ 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 ""
+#~ "Om deze optie opnieuw in te schakelen dient u \"PermitUserEnvironment yes"
+#~ "\" in /etc/ssh/sshd_config aan te zetten in nadat de opwaardering "
+#~ "compleet is; houd hierbij rekening met de waarschuwing in de sshd_config"
+#~ "(5) man-pagina."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Rechtenscheiding"
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 1d218ab8f..f91259960 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +25,50 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+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?"
+
+#. 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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -47,7 +84,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -64,7 +101,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -73,13 +110,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Zezwalaj wy��cznie na wersj� 2 protoko�u SSH"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -93,7 +130,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -104,7 +141,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -112,33 +149,15 @@ msgstr ""
 "Je�li p�niej zmienisz zdanie co do tego ustawienia, to instrukcje co "
 "zmieni� w sshd_config znajduj� si� w README.Debian."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "klucze ssh2 w��czone do plik�w konfiguracyjnych"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Pocz�wszy od wersji 3 OpenSSH nie u�ywa ju� osobnych plik�w dla kluczy ssh1 "
-"i ssh2. Oznacza to, �e pliki authorized_keys2 i known_hosts2 nie s� ju� "
-"potrzebne. B�d� one jednak odczytywane aby zachowa� wsteczn� kompatybilno��."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Czy chcesz kontynuowa� (i ryzykowa� przerwaniem aktywnych sesji ssh) ?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -150,7 +169,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -160,14 +179,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "UWAGA: Przekazywanie (forwarding) X11 i Autoryzacji jest domy�lnie wy��czone."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -177,7 +196,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -187,20 +206,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 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."
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: serwer rsh jest zainstalowany --- prawdopodobnie nienajlepszy pomys�"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -211,14 +230,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: telnetd jest zainstalowany --- prawdopodobnie nienajlepszy pomys�"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -232,13 +251,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Uwaga: musisz utworzy� nowy klucz hosta"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -250,113 +269,70 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "B�dziesz musia� wygenerowa� nowy klucz hosta."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "klucze ssh2 w��czone do plik�w konfiguracyjnych"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "Pocz�wszy od wersji 3 OpenSSH nie u�ywa ju� osobnych plik�w dla kluczy "
+#~ "ssh1 i ssh2. Oznacza to, �e pliki authorized_keys2 i known_hosts2 nie s� "
+#~ "ju� potrzebne. B�d� one jednak odczytywane aby zachowa� wsteczn� "
+#~ "kompatybilno��."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Czy chcesz uruchamia� serwer sshd ?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Czy chcesz uruchamia� serwer sshd ?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Ten pakiet zawiera zar�wno klienta ssh, jak i serwer sshd."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Ten pakiet zawiera zar�wno klienta ssh, jak i serwer sshd."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normalnie serwer sshd (Secure Shell Server) b�dzie uruchomiony aby umo�liwi� "
-"zdalny dost�p przez ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normalnie serwer sshd (Secure Shell Server) b�dzie uruchomiony aby "
+#~ "umo�liwi� zdalny dost�p przez ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Je�li jeste� zainteresowany u�ywaniem wy��cznie klienta ssh dla po��cze� "
-"wychodz�cych z tej maszyny, i nie chcesz si� na ni� logowa� przy pomocy ssh, "
-"to mo�esz teraz wy��czy� serwer sshd."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Je�li jeste� zainteresowany u�ywaniem wy��cznie klienta ssh dla po��cze� "
+#~ "wychodz�cych z tej maszyny, i nie chcesz si� na ni� logowa� przy pomocy "
+#~ "ssh, to mo�esz teraz wy��czy� serwer sshd."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Odradzamy stosowanie ustawie� �rodowiskowych dla kluczy."
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Odradzamy stosowanie ustawie� �rodowiskowych dla kluczy."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Ta wersja OpenSSH ma wy��czon� opcj� wykorzystywania ustawie� �rodowiskowych "
-"dla kluczy publicznych. Mo�na dzi�ki temu unikn�� pewnych atak�w (jak np.: "
-"LD_PRELOAD). Je�eli u�ywasz tej opcji w pliku authorized_keys, to zawarte w "
-"nim klucze nie b�d� dzia�a� dop�ki ta opcja nie zostanie usuni�ta."
+#~ 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 ""
+#~ "Ta wersja OpenSSH ma wy��czon� opcj� wykorzystywania ustawie� "
+#~ "�rodowiskowych dla kluczy publicznych. Mo�na dzi�ki temu unikn�� pewnych "
+#~ "atak�w (jak np.: LD_PRELOAD). Je�eli u�ywasz tej opcji w pliku "
+#~ "authorized_keys, to zawarte w nim klucze nie b�d� dzia�a� dop�ki ta opcja "
+#~ "nie zostanie usuni�ta."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Aby ponownie w��czy� t� opcj�, nale�y doda� wpis \"PermitUserEnvironment yes"
-"\" do pliku /etc/ssh/sshd_config po uko�czeniu aktualizacji. Przy zmianie "
-"konfiguracji nale�y zapozna� si� z informacjami zawartymi na stronie "
-"podr�cznika systemowego sshd_config(5)."
+#~ 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 ""
+#~ "Aby ponownie w��czy� t� opcj�, nale�y doda� wpis \"PermitUserEnvironment "
+#~ "yes\" do pliku /etc/ssh/sshd_config po uko�czeniu aktualizacji. Przy "
+#~ "zmianie konfiguracji nale�y zapozna� si� z informacjami zawartymi na "
+#~ "stronie podr�cznika systemowego sshd_config(5)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Separacja uprawnie�"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 00973c88d..4bf9baf82 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +25,50 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+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 ?"
+
+#. 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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -49,7 +86,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -68,7 +105,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -78,13 +115,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir somente protocolo SSH vers�o 2"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -100,7 +137,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -111,7 +148,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -120,34 +157,15 @@ msgstr ""
 "README.Debian deste pacote possui instru��es sobre o que mudar em seu "
 "arquivo de configura��o sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "Chaves ssh2 inclu�das nos arquivos de configura��o"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Deseja continuar (e arriscar acabar com sess�es ssh ativas) ?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -159,7 +177,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -169,13 +187,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "NOTA: Encaminhamento de X11 e Autoriza��o desabilitados por padr�o."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -185,7 +203,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -195,20 +213,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 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."
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Aviso: rsh-server est� instalado --- provavelmente n�o � uma boa id�ia"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -219,13 +237,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: telnetd est� instalado --- provavelmente n�o � uma boa id�ia"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -239,13 +257,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: voc� deve criar uma nova host key"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -257,113 +275,69 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Voc� precisar� gerar uma nova host key."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "Chaves ssh2 inclu�das nos arquivos de configura��o"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Voc� deseja executar o servidor sshd ?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Voc� deseja executar o servidor sshd ?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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."
+#~ 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."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normalmente o sshd Secure Shell Server ser� executado para permitir logins "
-"remotos via ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normalmente o sshd Secure Shell Server ser� executado para permitir "
+#~ "logins remotos via ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Se voc� est� interessado somente em usar o cliente ssh para conex�es para "
-"fora desta m�quina, e n�o quer logar na mesma usando ssh, ent�o voc� pode "
-"desabilitar o sshd aqui."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Se voc� est� interessado somente em usar o cliente ssh para conex�es para "
+#~ "fora desta m�quina, e n�o quer logar na mesma usando ssh, ent�o voc� pode "
+#~ "desabilitar o sshd aqui."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Op��es ed ambiente sobre chaves est�o obsoletas"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Op��es ed ambiente sobre chaves est�o obsoletas"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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."
+#~ 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."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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)."
+#~ 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)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Separa��o de Previl�gios"
diff --git a/debian/po/ru.po b/debian/po/ru.po
index f86cca6d2..6a46d1ec6 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +26,47 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "������ ���������� /usr/lib/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 "������������� ����� ���������������� ����"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -48,7 +82,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -64,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -74,13 +108,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "��������� ������������� ������ SSH-��������� ������ 2."
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -95,7 +129,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -106,7 +140,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -114,34 +148,15 @@ msgstr ""
 "���� ����� �� �������� ���� ������, �� � ����� README.Debian ���������� "
 "���������� � ���, ��� ����� ������� � ����� sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "����� ssh2 ��������� � ����� ��������"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"������� � ������ 3 OpenSSH �� ������������ ���������� ����� ��� ������ ssh1 "
-"� ssh2. ��� ��������, ��� ����� authorized_keys2 � known_hosts2 ������ �� "
-"�����. ��������� ��-�������� ����� �� ��������� ��� ����������� �������� "
-"�������������."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "�� ������ ���������� (������ �������� �������� ssh-����������)?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -153,7 +168,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -163,13 +178,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "����������: ���������� X11 � Authorization �������� �� ���������."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -179,7 +194,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -189,20 +204,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "������������� ���������� ����� ����� � /usr/share/doc/ssh/README.Debian"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "��������������: ���������� rsh-server --- �������, ��� �� ����� ������"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -212,13 +227,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "��������������: ���������� telnetd --- �������, ��� �� ����� ������"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -232,13 +247,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "��������������: �� ������ ������� ����� �������� ����."
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -250,110 +265,69 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "��� ���� ����� ������������� ����� ���� �����."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "������ ���������� /usr/lib/ssh-keysign ��� SUID root?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "�� ������ ����������� ���������� ��� SUID ��� ������� ssh-keysign."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "����� ssh2 ��������� � ����� ��������"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "������� � ������ 3 OpenSSH �� ������������ ���������� ����� ��� ������ "
+#~ "ssh1 � ssh2. ��� ��������, ��� ����� authorized_keys2 � known_hosts2 "
+#~ "������ �� �����. ��������� ��-�������� ����� �� ��������� ��� ����������� "
+#~ "�������� �������������."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "������ ��������� ������ sshd?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "������ ��������� ������ sshd?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "���� ����� �������� � ssh-������, � ssh-������."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "���� ����� �������� � ssh-������, � ssh-������."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"������ sshd Secure Shell Server ����������� ��� ���������� ����� � ������� "
-"����� ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "������ sshd Secure Shell Server ����������� ��� ���������� ����� � "
+#~ "������� ����� ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"���� ��� ���������� ������ ������������� ssh-������� ��� ��������� "
-"���������� � ���� ������, � �� �� ������ ������� � �� ������� ����� ssh, �� "
-"������ �� ������ ��������� sshd."
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "���� ��� ���������� ������ ������������� ssh-������� ��� ��������� "
+#~ "���������� � ���� ������, � �� �� ������ ������� � �� ������� ����� ssh, "
+#~ "�� ������ �� ������ ��������� sshd."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "����� ��������� ��� ������ ���� ���������"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "����� ��������� ��� ������ ���� ���������"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"��� ������ OpenSSH �� ��������� ��������� ����� ��������� ��� ��������� "
-"������, ����� �������� ���� (��������, LD_PRELOAD). ���� �� ����������� ��� "
-"����� � ����� authorized_keys, �� ������ �����������, ������ ����� ������ �� "
-"����� ��������, ���� ����� �� �������."
+#~ 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 ""
+#~ "��� ������ OpenSSH �� ��������� ��������� ����� ��������� ��� ��������� "
+#~ "������, ����� �������� ���� (��������, LD_PRELOAD). ���� �� ����������� "
+#~ "��� ����� � ����� authorized_keys, �� ������ �����������, ������ ����� "
+#~ "������ �� ����� ��������, ���� ����� �� �������."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"����� �����  ��������� ��� �����, ���������� �������� "
-"\"PermitUserEnvironment yes\" � ����� sshd_config ����� ���������� "
-"����������,� �������� �������� �� �������������� � �������� ����������� "
-"sshd_config(5)."
+#~ 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 ""
+#~ "����� �����  ��������� ��� �����, ���������� �������� "
+#~ "\"PermitUserEnvironment yes\" � ����� sshd_config ����� ���������� "
+#~ "����������,� �������� �������� �� �������������� � �������� ����������� "
+#~ "sshd_config(5)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "���������� ����������"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index e8e8e4cd2..a4224d581 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +26,43 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/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 ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -43,7 +73,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -54,7 +84,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -62,13 +92,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -78,7 +108,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -86,36 +116,21 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -124,7 +139,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -132,13 +147,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -146,7 +161,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -154,19 +169,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -174,13 +189,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -190,13 +205,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -205,90 +220,6 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index b40fcb2b2..499041ad2 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +17,52 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr ""
+"/usr/lib/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"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -39,7 +78,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -56,7 +95,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -65,13 +104,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Sadece SSH protokol 2'ye izin ver"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -86,7 +125,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -97,7 +136,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -106,35 +145,16 @@ msgstr ""
 "yapacağınız işlemlerle ilgili talimatları README.Debian dosyasında "
 "bulabilirsiniz."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "yapılandırma dosyalarındaki ssh2 anahtarları birleştirildi"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"Sürüm 3 itibarıyla OpenSSH artık, ssh1 ve ssh2 için ayrı yapılandırma "
-"dosyaları kullanmamaktadır. Bu, authorized_keys2 ve known_hosts2 "
-"dosyalarının artık gerekmediği anlamına gelir. Geriye doğru uyumluluğu "
-"korumak için bu dosyalar yine de okunacaktır."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 "Devam etmek istiyor musunuz? (Etkin ssh oturumlarının öldürülmesi riski var.)"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -146,7 +166,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -156,7 +176,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "NOT: X11 yönlendirme ve yetkilendirmesi öntanımlı olarak "
@@ -164,7 +184,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -174,7 +194,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -184,20 +204,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Daha ayrıntılı bilgi /usr/share/doc/ssh/README.Debian dosyasında bulunabilir."
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Uyarı: rsh-server kurulmuş --- bu muhtemelen iyi bir fikir değil"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -207,13 +227,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Uyarı: telnetd kurulmuş --- bu muhtemelen iyi bir fikir değil"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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 "
@@ -227,13 +247,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Uyarı: yeni bir makine anahtarı oluşturmalısınız"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -245,111 +265,66 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Yeni bir makine anahtarı oluşturmanız gerekiyor."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr ""
-"/usr/lib/ssh-keysign'ın root haklarıyla kurulmasını (SUID root) ister "
-"misiniz?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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
-#: ../templates.master:92
-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
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "SSH sunucusu sshd'yi çalıştırmak istiyor musunuz?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Bu paket hem ssh istemcisini hem de sshd sunucusunu içeriyor."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Güvenli Kabuk Sunucusu sshd, normalde ssh ile uzaktan girişlere izin vermek "
-"için çalıştırılacaktır."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"Eğer amacınız sadece bu makinedeki dış bağlantılar için ssh istemcisini "
-"kullanmak ise ve bu makineye ssh'la girmek gibi bir şeyi de istemiyorsanız, "
-"sshd sunucusunu bu adımda etkisizleştirebilirsiniz."
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Anahtarlara ilişkin ortam seçenekleri geçerliliğini kaybetmiştir"
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"OpenSSH'ın bu sürümü belirli atakları önlemek için (ör. LD_PRELOAD) ortak "
-"anahtarlara ait ortam seçeneklerini öntanımlı olarak etkisizleştirir. Eğer "
-"bu seçeneği bir authorized_keys dosyasında kullanıyorsanız, ilgili seçenek "
-"silininceye kadar bu anahtarın artık çalışmayacağını unutmayın."
-
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"Bu seçeneği tekrar etkinleştirmek için, sshd_config(5) kılavuz sayfasındaki "
-"uyarı notunu dikkate alarak, sshd yükseltmesi tamamlandığında /etc/ssh/"
-"ssh_config dosyasında \"PermitUserEnvironment yes\" satırını kullanın."
+#~ msgid "ssh2 keys merged in configuration files"
+#~ msgstr "yapılandırma dosyalarındaki ssh2 anahtarları birleştirildi"
+
+#~ 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 ""
+#~ "Sürüm 3 itibarıyla OpenSSH artık, ssh1 ve ssh2 için ayrı yapılandırma "
+#~ "dosyaları kullanmamaktadır. Bu, authorized_keys2 ve known_hosts2 "
+#~ "dosyalarının artık gerekmediği anlamına gelir. Geriye doğru uyumluluğu "
+#~ "korumak için bu dosyalar yine de okunacaktır."
+
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "SSH sunucusu sshd'yi çalıştırmak istiyor musunuz?"
+
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Bu paket hem ssh istemcisini hem de sshd sunucusunu içeriyor."
+
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Güvenli Kabuk Sunucusu sshd, normalde ssh ile uzaktan girişlere izin "
+#~ "vermek için çalıştırılacaktır."
+
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "Eğer amacınız sadece bu makinedeki dış bağlantılar için ssh istemcisini "
+#~ "kullanmak ise ve bu makineye ssh'la girmek gibi bir şeyi de "
+#~ "istemiyorsanız, sshd sunucusunu bu adımda etkisizleştirebilirsiniz."
+
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Anahtarlara ilişkin ortam seçenekleri geçerliliğini kaybetmiştir"
+
+#~ 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 ""
+#~ "OpenSSH'ın bu sürümü belirli atakları önlemek için (ör. LD_PRELOAD) ortak "
+#~ "anahtarlara ait ortam seçeneklerini öntanımlı olarak etkisizleştirir. "
+#~ "Eğer bu seçeneği bir authorized_keys dosyasında kullanıyorsanız, ilgili "
+#~ "seçenek silininceye kadar bu anahtarın artık çalışmayacağını unutmayın."
+
+#~ 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 ""
+#~ "Bu seçeneği tekrar etkinleştirmek için, sshd_config(5) kılavuz "
+#~ "sayfasındaki uyarı notunu dikkate alarak, sshd yükseltmesi "
+#~ "tamamlandığında /etc/ssh/ssh_config dosyasında \"PermitUserEnvironment yes"
+#~ "\" satırını kullanın."
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 342605317..263aada78 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: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+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,13 +25,47 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "您要将 /usr/lib/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 "生成新的配置文件"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -45,7 +79,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -60,7 +94,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -68,13 +102,13 @@ msgstr "强烈建议让我为您生成一份新的配置文件。"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "只允许 SSH 协议 2 (ssh2)。"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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 "
@@ -87,7 +121,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 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."
@@ -97,7 +131,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -105,33 +139,15 @@ msgstr ""
 "如果您稍后想改变这个设置，README.Debian 上有说明告诉您如何修改 sshd_Config 文"
 "件。"
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "ssh2 密钥被合并到配置文件"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-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 ""
-"在 OpenSSH 第 3 版不再为 ssh1 和 ssh2 的密钥使用不同的文件。这意味着 "
-"authorized_keys2 和 known_hosts2 文件将不再需要。但为了保持向后兼容性，它们仍"
-"会被读取。"
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "您要继续吗(会有杀死活动的 ssh 会话的危险)？"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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 "
@@ -142,7 +158,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 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."
@@ -152,13 +168,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "注意：X11 转发和认证默认被禁止。"
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -168,7 +184,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -178,19 +194,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "更多细节可以在 /usr/share/doc/ssh/README.Debian 找到"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "警告：已经安装了 rsh 服务器 --- 可能不是个好主意"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 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."
@@ -200,13 +216,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "警告：已经安装了 telnetd 服务器 --- 可能不是个好主意"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 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,13 +235,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "警告：您必须创建一个新的主机密钥"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 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 "
@@ -236,104 +252,63 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "您需要创建一个新的主机密钥。"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "您要将 /usr/lib/ssh-keysign 安装为 SUID root 程序吗？"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr "您使用为 ssh-keysign 帮助者程序设置 SUID 位的选项。"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 "ssh2 keys merged in configuration files"
+#~ msgstr "ssh2 密钥被合并到配置文件"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-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 ""
+#~ "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 ""
+#~ "在 OpenSSH 第 3 版不再为 ssh1 和 ssh2 的密钥使用不同的文件。这意味着 "
+#~ "authorized_keys2 ��� known_hosts2 ������将�����需�����但为了保�������������������它"
+#~ "��仍会被读���。"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "您要运行 sshd 服务器吗？"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "您要运行 sshd 服务器吗？"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "这个软件包内含 ssh 客户端和 sshd 服务器。"
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "这个软件包内含 ssh 客户端和 sshd 服务器。"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr "通常 sshd 安全 Shell 服务器都会运行以便允许通过 ssh 进行远程登录。"
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr "通常 sshd 安全 Shell 服务器都会运行以便允许通过 ssh 进行远程登录。"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-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 "
-"can disable sshd here."
-msgstr ""
-"如果您只要在这台机器上使用 ssh 客户端对外连接，完全不想通过 ssh 登录到本机，"
-"那么您可以在这里禁用 sshd 服务器。"
+#~ 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 can disable sshd here."
+#~ msgstr ""
+#~ "如果您只要在这台机器上使用 ssh 客户端对外连接，完全不想通过 ssh 登录到本"
+#~ "机，那么您可以在这里禁用 sshd 服务器。"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "密钥的环境选项已被废弃"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "密钥的环境选项已被废弃"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"为了避免一些攻击(如 LD_PRELOAD)，这个版本的 OpenSSH 默认禁用了公钥上的环境选"
-"项。如果您在某个授权密钥(authorized_keys)文件中用了这个参数，请注意除非删除了"
-"此选项，否则这个可疑的密钥将不再起作用。"
+#~ 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 ""
+#~ "为了避免一些攻击(如 LD_PRELOAD)，这个版本的 OpenSSH 默认禁用了公钥上的环境"
+#~ "选项。如果您在某个授权密钥(authorized_keys)文件中用了这个参数，请注意除非"
+#~ "删除了此选项，否则这个可疑的密钥将不再起作用。"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-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 ""
-"要重新启用这个选项，升级完成后请在 /etc/ssh/sshd_config 中加入一"
-"行：“PermitUserEnvironment yes”。请注意 sshd_config(5) 手册页中提到的警告。"
+#~ 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 ""
+#~ "要重新启用这个选项，升级完成后请在 /etc/ssh/sshd_config 中加入一"
+#~ "行：“PermitUserEnvironment yes”。请注意 sshd_config(5) 手册页中提到的警"
+#~ "告。"
 
 #~ msgid "Privilege separation"
 #~ msgstr "权限分离"
diff --git a/debian/rules b/debian/rules
index 4960ad921..0d9ea2974 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,7 +96,8 @@ 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/templates.master > debian/templates
+        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
 ifeq ($(PAMSUBST),yes)
@@ -114,16 +115,22 @@ install: build
         dh_clean -k
         dh_installdirs
 
-        # Add here commands to install the package into debian/ssh.
-        $(MAKE) -C build-deb DESTDIR=`pwd`/debian/ssh install-nokeys
+        $(MAKE) -C build-deb DESTDIR=`pwd`/debian/openssh-client install-nokeys
 
-        rm -f debian/ssh/etc/ssh/sshd_config
+        rm -f debian/openssh-client/etc/ssh/sshd_config
         #Temporary hack: remove /usr/share/Ssh.bin, since we have no smartcard support anyway.
-        rm -f debian/ssh/usr/share/Ssh.bin
+        rm -f debian/openssh-client/usr/share/Ssh.bin
 
-        install -m 755 contrib/ssh-copy-id debian/ssh/usr/bin/ssh-copy-id
-        install -m 644 -c contrib/ssh-copy-id.1 debian/ssh/usr/share/man/man1/ssh-copy-id.1
-        install -m 644 debian/moduli.5 debian/ssh/usr/share/man/man5/moduli.5
+        # Split off the server.
+        mv debian/openssh-client/usr/sbin/sshd debian/openssh-server/usr/sbin/
+        mv debian/openssh-client/usr/lib/sftp-server debian/openssh-server/usr/lib/
+        mv debian/openssh-client/usr/share/man/man8/sshd.8 debian/openssh-server/usr/share/man/man8/
+        mv debian/openssh-client/usr/share/man/man8/sftp-server.8 debian/openssh-server/usr/share/man/man8/
+        rmdir debian/openssh-client/var/run/sshd
+
+        install -m 755 contrib/ssh-copy-id debian/openssh-client/usr/bin/ssh-copy-id
+        install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1
+        install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5
 
         if [ -f contrib/gnome-ssh-askpass2 ]; then \
                 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \
@@ -134,13 +141,11 @@ install: build
         install -m 644 debian/ssh-askpass-gnome.desktop debian/ssh-askpass-gnome/usr/share/applications/ssh-askpass-gnome.desktop
         uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue
 
-        install -m 755 debian/ssh-argv0 debian/ssh/usr/bin/ssh-argv0
-        install -m 644 debian/ssh-argv0.1 debian/ssh/usr/share/man/man1/ssh-argv0.1
-
-        install -o root -g root debian/init debian/ssh/etc/init.d/ssh
-        install -o root -g root -m 644 debian/ssh.default debian/ssh/etc/default/ssh
+        install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0
+        install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1
 
-        install -o root -g root -m 755 -d debian/ssh/var/run/sshd
+        install -o root -g root debian/openssh-server.init debian/openssh-server/etc/init.d/ssh
+        install -o root -g root -m 644 debian/openssh-server.default debian/openssh-server/etc/default/ssh
 
         install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh
         install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp
@@ -153,45 +158,79 @@ binary-indep: build install
         # nothing to do
 
 # Build architecture-dependent files here.
-binary-arch: binary-ssh binary-ssh-askpass-gnome
+binary-arch: binary-openssh-client binary-openssh-server binary-ssh
+binary-arch: binary-ssh-askpass-gnome
 binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb
 
-binary-ssh: DH_OPTIONS=-pssh
-binary-ssh: build install
+binary-openssh-client: DH_OPTIONS=-popenssh-client
+binary-openssh-client: build install
         dh_testdir
         dh_testroot
 ifeq ($(PO2DEBCONF),yes)
-        po2debconf -e utf8 debian/templates.master > debian/templates
+        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/ssh/usr/share/doc/ssh/copyright
+        cat debian/copyright.head LICENCE > debian/openssh-client/usr/share/doc/openssh-client/copyright
+        dh_installchangelogs ChangeLog
+        dh_strip
+        dh_compress
+        dh_fixperms
+        dh_installdeb
+        test ! -e debian/ssh/etc/ssh/ssh_prng_cmds \
+          || echo "/etc/ssh/ssh_prng_cmds" >> debian/openssh-client/DEBIAN/conffiles
+        dh_shlibdeps
+        dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))'
+        dh_md5sums
+        dh_builddeb
+
+binary-openssh-server: DH_OPTIONS=-popenssh-server
+binary-openssh-server: build install
+        dh_testdir
+        dh_testroot
+ifeq ($(PO2DEBCONF),yes)
+        po2debconf -e utf8 debian/openssh-server.templates.master > debian/openssh-server.templates
+endif
+        dh_installdebconf
+        dh_installdocs OVERVIEW README
+        cat debian/copyright.head LICENCE > debian/openssh-server/usr/share/doc/openssh-server/copyright
 ifeq ($(PAMSUBST),yes)
         # Clean up if we've done this already, to ensure idempotency.
-        if [ -f debian/ssh.pam.new-style ]; then \
-                mv debian/ssh.pam.new-style debian/ssh.pam; \
+        if [ -f debian/openssh-server.ssh.pam.new-style ]; then \
+                mv debian/openssh-server.ssh.pam.new-style debian/openssh-server.ssh.pam; \
         fi
-        cp -a debian/ssh.pam debian/ssh.pam.new-style
+        cp -a debian/openssh-server.ssh.pam debian/openssh-server.ssh.pam.new-style
         sed -e "s/@include common-auth/auth       required     pam_unix.so/" \
             -e "s/@include common-account/account    required     pam_unix.so/" \
             -e "s/@include common-session/session    required     pam_unix.so/" \
             -e "s/@include common-password/password   required     pam_unix.so/" \
-            debian/ssh.pam.new-style > debian/ssh.pam
+            debian/openssh-server.ssh.pam.new-style > debian/openssh-server.ssh.pam
 endif
-        dh_installpam
+        dh_installpam --name ssh # TODO: breaks woody backports
         dh_installchangelogs ChangeLog
         dh_strip
         dh_compress
         dh_fixperms
         dh_installdeb
-        test ! -e debian/ssh/etc/ssh/ssh_prng_cmds \
-          || echo "/etc/ssh/ssh_prng_cmds" >> debian/ssh/DEBIAN/conffiles
         dh_shlibdeps
         dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' \
                          -V'pam-depends=$(PAMDEP)'
         dh_md5sums
         dh_builddeb
 
+binary-ssh: DH_OPTIONS=-pssh
+binary-ssh: build install
+        dh_testdir
+        dh_testroot
+        dh_installdocs
+        dh_installchangelogs
+        dh_compress
+        dh_fixperms
+        dh_installdeb
+        dh_gencontrol
+        dh_md5sums
+        dh_builddeb
+
 binary-ssh-askpass-gnome: DH_OPTIONS=-pssh-askpass-gnome
 binary-ssh-askpass-gnome: build install
         dh_testdir
@@ -237,5 +276,7 @@ binary-openssh-server-udeb: build install
 binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install
-.PHONY: build-deb build-udeb binary-ssh binary-ssh-askpass-gnome
+.PHONY: build-deb build-udeb
+.PHONY: binary-openssh-client binary-openssh-server binary-ssh
+.PHONY: binary-ssh-askpass-gnome
 .PHONY: binary-openssh-client-udeb binary-openssh-server-udeb
diff --git a/debian/ssh.default b/debian/ssh.default
deleted file mode 100644
index aa03c4e07..000000000
--- a/debian/ssh.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for ssh. This file is sourced by /bin/sh from
-# /etc/init.d/ssh.
-
-# Options to pass to sshd
-SSHD_OPTS=