Remove ssh/use_old_init_script, which was a workaround for a very old

bug in /etc/init.d/ssh.  If anyone has ignored this for >10 years then
they aren't going to be convinced now.

1 files changed, 34 insertions, 40 deletions

diff --git a/debian/po/ja.po b/debian/po/ja.po
index b011ddc0a..fc7ea78c6 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,51 +15,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh\n"
 "Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
-"POT-Creation-Date: 2010-01-02 08:55+0000\n"
+"POT-Creation-Date: 2013-05-21 23:52+0100\n"
 "PO-Revision-Date: 2008-05-17 21:28+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../openssh-server.templates:1001
-msgid "Do you want to risk killing active SSH sessions?"
-msgstr "接続中の SSH セッションが切れるかもしれませんがよいですか?"
-
-#. Type: boolean
-#. Description
-#: ../openssh-server.templates:1001
-msgid ""
-"The currently installed version of /etc/init.d/ssh is likely to kill all "
-"running sshd instances. If you are doing this upgrade via an SSH session, "
-"you're likely to be disconnected and leave the upgrade procedure unfinished."
-msgstr ""
-"現在インストールされたバージョンの /etc/init.d/ssh は、おそらく実行中の sshd "
-"インスタンスをすべて殺します。このアップグレードを SSH セッション経由で行って"
-"いる場合、あなたは切断され、アップグレード処理は不完全なままになるでしょう。"
-
-#. Type: boolean
-#. Description
-#: ../openssh-server.templates:1001
-msgid ""
-"This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to the "
-"start-stop-daemon line in the stop section of the file."
-msgstr ""
-"この状況を修正するには、ファイルの stop セクションの start-stop-daemon の行に"
-"「--pidfile /var/run/sshd.pid」と手動で追加します。"
-
 #. Type: note
 #. Description
-#: ../openssh-server.templates:2001
+#: ../openssh-server.templates:1001
 msgid "New host key mandatory"
 msgstr "新しいホストキーが必要です"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:2001
+#: ../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 "
@@ -72,19 +45,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:2001
+#: ../openssh-server.templates:1001
 msgid "You need to manually generate a new host key."
 msgstr "新しいホストキーを手動で生成する必要があります。"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 msgid "Disable challenge-response authentication?"
 msgstr "チャレンジ-レスポンス認証を無効にしますか?"
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 msgid ""
 "Password authentication appears to be disabled in the current OpenSSH server "
 "configuration. In order to prevent users from logging in using passwords "
@@ -101,7 +74,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openssh-server.templates:3001
+#: ../openssh-server.templates:2001
 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 "
@@ -115,13 +88,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:4001
+#: ../openssh-server.templates:3001
 msgid "Vulnerable host keys will be regenerated"
 msgstr "脆弱なホストキーは再生成されます"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:4001
+#: ../openssh-server.templates:3001
 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, "
@@ -135,7 +108,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:4001
+#: ../openssh-server.templates:3001
 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-"
@@ -148,13 +121,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:4001
+#: ../openssh-server.templates:3001
 msgid "The affected host keys are:"
 msgstr "影響を受けるホストキーは次のとおりです:"
 
 #. Type: note
 #. Description
-#: ../openssh-server.templates:4001
+#: ../openssh-server.templates:3001
 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/"
@@ -164,6 +137,27 @@ msgstr ""
 "て、'ssh-vulnkey' コマンドを利用できます。詳細については /usr/share/doc/"
 "openssh-server/README.compromised-keys.gz を参照してください。"
 
+#~ msgid "Do you want to risk killing active SSH sessions?"
+#~ msgstr "接続中の SSH セッションが切れるかもしれませんがよいですか?"
+
+#~ msgid ""
+#~ "The currently installed version of /etc/init.d/ssh is likely to kill all "
+#~ "running sshd instances. If you are doing this upgrade via an SSH session, "
+#~ "you're likely to be disconnected and leave the upgrade procedure "
+#~ "unfinished."
+#~ msgstr ""
+#~ "現在インストールされたバージョンの /etc/init.d/ssh は、おそらく実行中の "
+#~ "sshd インスタンスをすべて殺します。このアップグレードを SSH セッション経由"
+#~ "で行っている場合、あなたは切断され、アップグレード処理は不完全なままになる"
+#~ "でしょう。"
+
+#~ msgid ""
+#~ "This can be fixed by manually adding \"--pidfile /var/run/sshd.pid\" to "
+#~ "the start-stop-daemon line in the stop section of the file."
+#~ msgstr ""
+#~ "この状況を修正するには、ファイルの stop セクションの start-stop-daemon の"
+#~ "行に「--pidfile /var/run/sshd.pid」と手動で追加します。"
+
 #~ msgid "Generate a new configuration file for OpenSSH?"
 #~ msgstr "OpenSSH の新しい設定ファイルを作りますか?"