Some small improvements to the English templates courtesy of Christian

Perrier. I've manually unfuzzied a few translations where it was obvious,
on Christian's advice, but the others will have to be updated.

11 files changed, 58 insertions, 49 deletions

diff --git a/debian/changelog b/debian/changelog
index 23352d06a..bc7542a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openssh (1:3.6.1p2-7) UNRELEASED; urgency=low
   * Update debconf template translations:
     - French (thanks, Christian Perrier; closes: #208801).
     - Japanese (thanks, Kenshi Muto; closes: #210380).
+  * Some small improvements to the English templates courtesy of Christian
+    Perrier. I've manually unfuzzied a few translations where it was
+    obvious, on Christian's advice, but the others will have to be updated.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 11 Sep 2003 11:45:35 +0100
 
diff --git a/debian/po/da.po b/debian/po/da.po
index 56a83f826..56b157d18 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+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"
@@ -73,9 +73,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 "Siden du har bedt mig om at lave en sshd_config fil til dig, kan du vælge om "
 "du vil have privilegie adskillelse slået til eller ej. Medmindre du kører "
@@ -182,7 +182,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Vil du fortsætte (og risikere at afbryde aktive ssh-forbindelser)?"
 
 #. Description
@@ -325,7 +325,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr "Vil du køre sshd-serveren?"
 
 #. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 1e363835d..c97b14e22 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: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+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"
@@ -62,9 +62,9 @@ msgstr ""
 #: ../templates.master:19
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 
 #. Description
@@ -142,7 +142,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Wollen Sie weitermachen (und das Killen der Session riskieren)?"
 
 #. Description
@@ -277,7 +277,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr "Möchten Sie den sshd Server starten?"
 
 #. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index 92cfbe2bd..844c43598 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+0100\n"
 "PO-Revision-Date: 2003-06-21 15:30+0200\n"
 "Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -75,9 +75,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 "Puesto que ha elegido crear automáticamente el fichero sshd_config, puede "
 "decidir ahora si quiere activar la opción de separación de privilegios. A "
@@ -187,7 +187,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "¿Desea continuar, aún a riesgo de matar las sesiones ssh activas?"
 
 #. Description
@@ -326,7 +326,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr "¿Quiere ejecutar el servidor sshd?"
 
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 303778ee3..178c833d5 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: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+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"
@@ -72,9 +72,9 @@ msgstr ""
 #: ../templates.master:19
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 "Comme vous souhaitez que le fichier de configuration sshd_config soit généré "
 "à votre place, vous pouvez choisir d'activer ou non l'option de séparation "
@@ -187,7 +187,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 "Voulez-vous continuer (et risquer de rompre les sessions ssh actives) ?"
 
@@ -337,7 +337,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr "Voulez-vous utiliser le serveur sshd ?"
 
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index e37cb1ed0..444e29217 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: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+0100\n"
 "PO-Revision-Date: 2003-09-11 13:11+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -67,11 +67,12 @@ msgstr ""
 
 #. Description
 #: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 "sshd_config ¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤òÁªÂò¤·¤¿¤Î¤Ç¡¢ ¤³¤³¤ÇÆø¢Ê¬Î¥¤òÍ­¸ú¤Ë"
 "¤¹¤ë¤«¤·¤Ê¤¤¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£PAM ¤Îµ¡Ç½¤Î¤¦¤ÁÆø¢Ê¬Î¥¤È¶¦Â¸¤Ç¤­¤Ê¤¤µ¡Ç½¤ò»È"
@@ -173,7 +174,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "³¤±¤Æ¤è¤¤¤Ç¤¹¤« (ÀܳÃæ¤Î ssh ¥»¥Ã¥·¥ç¥ó¤¬ÀÚ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)"
 
 #. Description
@@ -313,7 +314,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr "sshd ¥µ¡¼¥Ð¤ò¼Â¹Ô¤·¤Þ¤¹¤«?"
 
 #. Description
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 6910ceaf7..853144294 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+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"
@@ -73,9 +73,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 "Zdecydowa³e¶ siê na to abym wygenerowa³ dla ciebie plik sshd_config, i "
 "mo¿esz wybraæ czy chcesz w³±czyæ Separacjê Uprawnieñ, czy te¿ nie. Je¶li nie "
@@ -183,7 +183,8 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+#, fuzzy
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Czy chcesz kontynuowaæ (i ryzykowaæ zabicie aktywnych sesji ssh) ?"
 
 #. Description
@@ -326,7 +327,8 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+#, fuzzy
+msgid "Do you want to run the sshd server?"
 msgstr "Czy chcesz uruchamiaæ serwer sshd ?"
 
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 017d13cf4..9ac5f81ae 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-5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+0100\n"
 "PO-Revision-Date: 2003-03-08 16:56+0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -69,11 +69,12 @@ msgstr ""
 
 #. Description
 #: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 "Uma vez que você optou por permitir que o debconf gere o arquivo sshd_config "
 "para você, é possível escolher se você deseja ter ou não o recurso de "
@@ -189,7 +190,8 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+#, fuzzy
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Deseja continuar (e arriscar acabar com sessões ssh ativas) ?"
 
 #. Description
@@ -330,7 +332,8 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+#, fuzzy
+msgid "Do you want to run the sshd server?"
 msgstr "Você quer executar o servidor sshd ?"
 
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index bb33e63a1..ddb40af47 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: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+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"
@@ -62,9 +62,9 @@ msgstr ""
 #: ../templates.master:19
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 
 #. Description
@@ -142,7 +142,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "÷Ù ÈÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ (ÒÉÓËÕÑ ÐÏÔÅÒÑÔØ ÁËÔÉ×ÎÙÅ ssh-ÓÏÅÄÉÎÅÎÉÑ)?"
 
 #. Description
@@ -288,7 +288,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr "èÏÔÉÔÅ ÚÁÐÕÓÔÉÔØ ÓÅÒ×ÅÒ sshd?"
 
 #. Description
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 42e6a9522..6d22b7ce4 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: 2003-08-27 02:20+0100\n"
+"POT-Creation-Date: 2003-09-12 21:03+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"
@@ -62,9 +62,9 @@ msgstr ""
 #: ../templates.master:19
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
-"choose whether or not to have Privilege Separation turned on or not. Unless "
+"choose whether or not to have privilege separation turned on or not. Unless "
 "you know you need to use PAM features that won't work with this option, you "
-"should say yes here."
+"should enable it."
 msgstr ""
 
 #. Description
@@ -142,7 +142,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr ""
 
 #. Description
@@ -256,7 +256,7 @@ msgstr ""
 
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr ""
 
 #. Description
diff --git a/debian/templates.master b/debian/templates.master
index a4005fd38..4d60e95da 100644
--- a/debian/templates.master
+++ b/debian/templates.master
@@ -26,9 +26,9 @@ _Description: Enable Privilege separation
  fail, and PAM keyboard-interactive authentication won't work.
  .
  Since you've opted to have me generate an sshd_config file for you, you
- can choose whether or not to have Privilege Separation turned on or not.
+ can choose whether or not to have privilege separation turned on or not.
  Unless you know you need to use PAM features that won't work with this
- option, you should say yes here.
+ option, you should enable it.
 
 Template: ssh/new_config
 Type: boolean
@@ -75,7 +75,7 @@ _Description: ssh2 keys merged in configuration files
 Template: ssh/use_old_init_script
 Type: boolean
 Default: false
-_Description: Do you want to continue (and risk killing active ssh sessions) ?
+_Description: Do you want to continue (and risk killing active ssh sessions)?
  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
  session, that would be a Bad Thing(tm).
@@ -134,7 +134,7 @@ _Description: Do you want /usr/lib/ssh-keysign to be installed SUID root?
 Template: ssh/run_sshd
 Type: boolean
 Default: true
-_Description: Do you want to run the sshd server ?
+_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