Remove support for upgrading from ssh-nonfree.

1 files changed, 26 insertions, 35 deletions

diff --git a/debian/po/nb.po b/debian/po/nb.po
index af958815b..575b49f4f 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
-"POT-Creation-Date: 2013-05-21 23:52+0100\n"
+"POT-Creation-Date: 2013-05-21 23:58+0100\n"
 "PO-Revision-Date: 2008-05-17 11:04+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -18,41 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Type: note
-#. Description
-#: ../openssh-server.templates:1001
-msgid "New host key mandatory"
-msgstr "Ny vertsnøkkel obligatorisk"
-
-#. Type: note
-#. Description
-#: ../openssh-server.templates:1001
-msgid ""
-"The current host key, in /etc/ssh/ssh_host_key, is encrypted with the IDEA "
-"algorithm. OpenSSH can not handle this host key file, and the ssh-keygen "
-"utility from the old (non-free) SSH installation does not appear to be "
-"available."
-msgstr ""
-"Den gjeldende vertsnøkkelen, i /etc/ssh/ssh_host_key, er kryptert med IDEA-"
-"algoritmen. OpenSSH kan ikke håndtere denne vertsnøkkelfila, og det ser ikke "
-"ut til at verktøyet ssh-keygen fra den gamle (ikke-frie) SSH-installasjonen "
-"er tilgjengelig."
-
-#. Type: note
-#. Description
-#: ../openssh-server.templates:1001
-msgid "You need to manually generate a new host key."
-msgstr "En ny vertsnøkkel må lages manuelt."
-
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates:2001
+#: ../openssh-server.templates:1001
 msgid "Disable challenge-response authentication?"
 msgstr "Skal autentisering med utfordring/svar slås av?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates:2001
+#: ../openssh-server.templates:1001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -70,7 +44,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates:2001
+#: ../openssh-server.templates:1001
 msgid ""
 "If you disable challenge-response authentication, then users will not be "
 "able to log in using passwords. If you leave it enabled (the default "
@@ -84,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 msgid "Vulnerable host keys will be regenerated"
 msgstr "Sårbare vertsnøkler vil bli laget på nytt"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 msgid ""
 "Some of the OpenSSH server host keys on this system were generated with a "
 "version of OpenSSL that had a broken random number generator. As a result, "
@@ -104,7 +78,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 msgid ""
 "Users of this system should be informed of this change, as they will be "
 "prompted about the host key change the next time they log in. Use 'ssh-"
@@ -118,13 +92,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 msgid "The affected host keys are:"
 msgstr "De vertsnøklene dette gjelder er:"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 msgid ""
 "User keys may also be affected by this problem. The 'ssh-vulnkey' command "
 "may be used as a partial test for this. See /usr/share/doc/openssh-server/"
@@ -134,6 +108,23 @@ msgstr ""
 "dette kan gjøres med kommandoen «ssh-vulnkey». Mer detaljer finnes i /usr/"
 "share/doc/openssh-server/README.compromised-keys.gz."
 
+#~ msgid "New host key mandatory"
+#~ msgstr "Ny vertsnøkkel obligatorisk"
+
+#~ msgid ""
+#~ "The current host key, in /etc/ssh/ssh_host_key, is encrypted with the "
+#~ "IDEA algorithm. OpenSSH can not handle this host key file, and the ssh-"
+#~ "keygen utility from the old (non-free) SSH installation does not appear "
+#~ "to be available."
+#~ msgstr ""
+#~ "Den gjeldende vertsnøkkelen, i /etc/ssh/ssh_host_key, er kryptert med "
+#~ "IDEA-algoritmen. OpenSSH kan ikke håndtere denne vertsnøkkelfila, og det "
+#~ "ser ikke ut til at verktøyet ssh-keygen fra den gamle (ikke-frie) SSH-"
+#~ "installasjonen er tilgjengelig."
+
+#~ msgid "You need to manually generate a new host key."
+#~ msgstr "En ny vertsnøkkel må lages manuelt."
+
 #~ msgid "Do you want to risk killing active SSH sessions?"
 #~ msgstr "Vil du risikere å avbryte aktive SSH-økter?"