10 files changed, 910 insertions, 124 deletions

diff --git a/debian/po/da.po b/debian/po/da.po
index ee57c65fd..02fb0dd5c 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: 2003-09-12 21:03+0100\n"
+"POT-Creation-Date: 2003-11-15 15:36+0000\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"
@@ -23,11 +23,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Privilegie adskillelse"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -39,11 +41,13 @@ msgstr ""
 "slå det fra, skal du bruge \"UsePrivilegeSeparation no\" i /etc/ssh/"
 "sshd_config."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Slå privilegie adskillelse til"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -55,6 +59,7 @@ msgstr ""
 "mulighed. Det reducerer markant mængden af kode der kører som root, og "
 "derfor reducerer det impakten på sikkerhedshuller i sshd."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -66,6 +71,7 @@ msgstr ""
 "der skal køres som root (pam_mkhomedir, f.eks.) vil fejle, og PAM tastatur-"
 "interaktive autentifikationer vil ikke virke."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -79,11 +85,13 @@ msgstr ""
 "du skal bruge PAM funktioner som ikke vil virke med dette tilvalg, skal du "
 "sige ja her."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Opret ny opsætningsfil"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -95,10 +103,11 @@ msgid ""
 msgstr ""
 "Denne version af OpenSSH har en betydeligt ændret opsætningsfil fra den "
 "version der kom med Debian 'Potato', som du ser ud til at opgraderer fra. "
-"Jeg kan nu oprette en ny opsætningsfil (/etc/ssh/sshd.config), som vil "
-"virke med den nye server version, men det vil ikke beholde eventuelle "
-"ændringer du lavede med den gamle version."
+"Jeg kan nu oprette en ny opsætningsfil (/etc/ssh/sshd.config), som vil virke "
+"med den nye server version, men det vil ikke beholde eventuelle ændringer du "
+"lavede med den gamle version."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -114,19 +123,21 @@ msgstr ""
 "standard-værdi (se README.Debian for flere detaljer), men du kan altid "
 "redigere sshd_config og slå det fra, hvis du ønsker."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
-msgstr ""
-"Du rådes stærkt til at lade mig oprette en ny opsætningsfil for dig."
+msgstr "Du rådes stærkt til at lade mig oprette en ny opsætningsfil for dig."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Tillad kun SSH protokol 2"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -140,6 +151,7 @@ msgstr ""
 "sløve langsomme maskiner ned, og forhindre ældre klienter i at opnå "
 "forbindelse (ssh klienten der kommer med \"potato\" er en af dem)."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -150,6 +162,7 @@ msgstr ""
 "forskellige, så du vil ikke være i stand til at bruge dem, hvis du kun "
 "tillader protokol 2 forbindelser."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -159,11 +172,13 @@ 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:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "ssh2-nøgler flettet i opsætningsfilerne"
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -176,11 +191,13 @@ msgstr ""
 "længere er nødvendige. De vil stadig dog stadig blive læst for "
 "bagudkompatilitetens skyld."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 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:78
 msgid ""
@@ -192,6 +209,7 @@ msgstr ""
 "alle sshd-dæmoner. Det vil være en rigtigt dårlig idé, hvis du er ved at "
 "opgradere via en ssh-forbindelse."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -201,12 +219,14 @@ msgstr ""
 "Du kan afhjælpe dette ved at tilføje \"--pidfile /var/run/sshd.pid\" til "
 "'start-stop-daemon'-linjen i stop-afsnittet af filen."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:88
 msgid ""
@@ -216,25 +236,29 @@ msgstr ""
 "Af sikkerhedsgrunde har Debianudgaven af ssh sat ForwardX11 og ForwardAgent "
 "til 'off' som standard."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
 msgstr ""
-"Du kan aktivere dem for servere du stoler på, enten i en af opsætningsfilerne "
-"eller med kommandolinjetilvalget '-X'."
+"Du kan aktivere dem for servere du stoler på, enten i en af "
+"opsætningsfilerne eller med kommandolinjetilvalget '-X'."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:99
 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:99
 msgid ""
@@ -245,11 +269,13 @@ msgstr ""
 "ved, at du har rsh-server installeret. Jeg vil råde dig til at fjerne pakken "
 "rsh-server."
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 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:106
 msgid ""
@@ -263,11 +289,13 @@ msgstr ""
 "der i det mindste er en mulighed for, at telnet-sessioner ikke sender "
 "adgangskoder og sessions-oplysninger ukrypteret over netværket."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Advarsel: du skal oprette en ny værtsnøgle"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid ""
@@ -279,16 +307,19 @@ msgstr ""
 "håndtere sådan en værtsnøglefil, og jeg kan ikke finde værktøjet ssh-keygen "
 "fra den gamle (ikke-frie, 'non-free') SSH-installation."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Du skal oprette en ny værtsnøgle."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 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:124
 msgid ""
@@ -297,6 +328,7 @@ msgid ""
 msgstr ""
 "Du har mulighed for at installere ssh-keysign hjælperen med SUID-flaget sat."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -306,6 +338,7 @@ 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
 #: ../templates.master:124
 msgid ""
@@ -316,16 +349,19 @@ msgstr ""
 "det skaber problemer, kan du ændre det tilbage igen ved at køre: dpkg-"
 "reconfigure ssh"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid "Do you want to run the sshd server?"
 msgstr "Vil du køre sshd-serveren?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 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:137
 msgid ""
@@ -335,6 +371,7 @@ 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:137
 msgid ""
@@ -346,11 +383,13 @@ msgstr ""
 "forbindelser fra denne maskine, og ikke ønsker at tilgå denne maskine udefra "
 "via ssh, kan du nu deaktivere sshd."
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 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:149
 msgid ""
@@ -360,10 +399,11 @@ msgid ""
 "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."
+"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:149
 msgid ""
@@ -371,6 +411,6 @@ msgid ""
 "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 "
+"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."
diff --git a/debian/po/de.po b/debian/po/de.po
index 1e363835d..fb337fce2 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-11-15 15:36+0000\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"
@@ -24,11 +24,13 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -37,11 +39,13 @@ msgid ""
 "sshd_config."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -50,6 +54,7 @@ msgid ""
 "reduces the impact of security holes in sshd."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -58,20 +63,23 @@ msgid ""
 "fail, and PAM keyboard-interactive authentication won't work."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../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 ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -82,6 +90,7 @@ msgid ""
 "any customisations you made with the old version."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -92,6 +101,7 @@ msgid ""
 "edit sshd_config and set it to no if you wish."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -99,11 +109,13 @@ msgid ""
 "for you."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -113,6 +125,7 @@ msgid ""
 "connecting (the ssh client shipped with \"potato\" is affected)."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -120,6 +133,7 @@ msgid ""
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -127,11 +141,13 @@ msgid ""
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -140,11 +156,13 @@ msgid ""
 "needed. They will still be read in order to maintain backwards compatibility"
 msgstr ""
 
+#. Type: boolean
 #. 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)?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -156,6 +174,7 @@ msgstr ""
 "Ihre aktiven ssh-Instanzen killen. Wenn Sie das Upgrade via ssh erledigen, "
 "dann ist das ein Problem."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -166,11 +185,13 @@ msgstr ""
 "die start-stop-daemon Zeile in dem Bereich stop der Datei /etc/init.d/ssh "
 "ergänzen."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "HINWEIS: Forwarden von X11 und Authorisierung ist abgeschaltet."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -180,6 +201,7 @@ msgstr ""
 "Aus Sicherheitsgründen sind die Debian Pakete von ssh ForwardX11 und "
 "ForwardAgent auf \"off\" gesetzt."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -189,17 +211,20 @@ msgstr ""
 "Sie können dies für Server, denen Sie trauen, entweder per Eintrag in die "
 "Konfigurations Dateien oder per Kommando-Zeilen Option -X ändern."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Weitere Details koennen Sie in /usr/share/doc/ssh/README.Debian finden."
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Warnung: rsh-server ist installiert --- möglicherweise"
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid ""
@@ -209,11 +234,13 @@ msgstr ""
 "ist es eine schlechte Idee, den rsh-server installiert zu haben, da er die "
 "Sicherheit untergräbt. Wir empfehlen, das Paket zu entfernen."
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Warnung: telnetd ist installiert --- schlechte Idee"
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid ""
@@ -226,11 +253,13 @@ msgstr ""
 "anbieten) oder telnetd-ssl zu installieren, so daß Sie verhindern können, "
 "daß Login und Password unverschlüsselt durch das Netz gesendet werden."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Warnung: Sie müssen einen neuen Host Key erzeugen"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 #, fuzzy
@@ -244,16 +273,19 @@ msgstr ""
 "ssh-keygen von der alten (nicht-freien) ssh Installation kann nicht gefunden "
 "werden."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -261,6 +293,7 @@ msgid ""
 "set."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -268,6 +301,7 @@ msgid ""
 "based authentication."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -275,16 +309,19 @@ msgid ""
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
 
+#. Type: boolean
 #. 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?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 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:137
 msgid ""
@@ -293,6 +330,7 @@ msgid ""
 msgstr ""
 "Normal wird der sshd Secure Shell Server für Remote Logins per ssh gestartet."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -304,11 +342,13 @@ msgstr ""
 "verbinden und sich nicht per ssh in diesen Computer einloggen wollen, dann "
 "können Sie hier den sshd abschalten."
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -318,6 +358,7 @@ msgid ""
 "question will no longer work until the option is removed."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
diff --git a/debian/po/es.po b/debian/po/es.po
index 92cfbe2bd..de21fe2e9 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-11-15 15:36+0000\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"
@@ -25,11 +25,13 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Separación de privilegios"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -41,11 +43,13 @@ msgstr ""
 "desactivarla, tiene que añadir \"UsePrivilegeSeparation no\" al fichero /etc/"
 "ssh/sshd_config."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Activar separación de privilegios"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -58,6 +62,7 @@ msgstr ""
 "ejecuta como root, por lo que reduce el impacto de posibles agujeros de "
 "seguridad en sshd."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -70,14 +75,15 @@ msgstr ""
 "ejemplo, pam_mkhomedir) y la autentificación interactiva PAM con teclado no "
 "funcionarán."
 
+#. Type: boolean
 #. 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 ""
 "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 "
@@ -85,11 +91,13 @@ msgstr ""
 "no arrancará) o sepa que necesita usar ciertas características de PAM que "
 "funcionan con esta opción, debería responder sí a esta pregunta."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Generar un nuevo fichero de configuración"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -106,6 +114,7 @@ msgstr ""
 "del servidor, pero no incuirá las modificaciones que hiciera en la versión "
 "antigua."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -122,6 +131,7 @@ msgstr ""
 "Debian si quiere conocer más detalles), pero siempre puede editar "
 "sshd_config y poner no si lo desea."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -131,11 +141,13 @@ msgstr ""
 "Es muy recomendable que permita que se genere un nuevo fichero de "
 "configuración ahora."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir sólo la versión 2 del protocolo SSH"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -149,6 +161,7 @@ msgstr ""
 "funcionará más lento en máquinas modestas y puede impedir que se conecten "
 "clientes antiguos, como, por ejemplo, el incluido en \"potato\"."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -159,6 +172,7 @@ msgstr ""
 "diferentes, por lo que no podrá usarlas si únicamente permite conexiones "
 "mediante la versión 2 del protocolo."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -168,11 +182,13 @@ 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:69
 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:69
 msgid ""
@@ -185,11 +201,13 @@ msgstr ""
 "authorized_keys2 y known_hosts2, aunque aún se seguirán leyendo para "
 "mantener compatibilidad hacia atrás."
 
+#. Type: boolean
 #. 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?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -201,6 +219,7 @@ msgstr ""
 "el demonio ssh. Si está actualizando a través de una sesión ssh, puede que "
 "no sea muy buena idea."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -210,11 +229,13 @@ msgstr ""
 "Puede arreglarlo añadiendo \"--pidfile /var/run/sshd.pid\" a la línea 'start-"
 "stop-daemon', en la sección 'stop' del fichero."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:88
 msgid ""
@@ -224,6 +245,7 @@ msgstr ""
 "Por razones de seguridad, la versión de ssh de Debian tiene por defecto "
 "ForwardX11 y ForwardAgent desactivadas."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -233,16 +255,19 @@ msgstr ""
 "Puede activar estas opciones para los servidores en los que confíe, en los "
 "ficheros de configuración o con la opción -X en línea de comandos."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Aviso: tiene rsh-server instalado"
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid ""
@@ -253,11 +278,13 @@ msgstr ""
 "probablemente desea obtener instalando ssh. Es muy aconsejable que borre ese "
 "paquete."
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: tiene telnetd instalado"
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid ""
@@ -271,11 +298,13 @@ msgstr ""
 "contraseñas, nombres de usuario y demás información de las sesiones telnet "
 "no viajen sin cifrar por la red."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: debe crear una nueva clave para su servidor"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid ""
@@ -287,16 +316,19 @@ msgstr ""
 "OpenSSH no puede manejar este fichero de claves y tampoco se encuentra la "
 "utilidad ssh-keygen incluida en el paquete ssh no libre."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Necesitará generar una nueva clave para su servidor."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 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:124
 msgid ""
@@ -306,6 +338,7 @@ msgstr ""
 "Puede instalar ssh-keysign con el bit SUID (se ejecutará con privilegios de "
 "root)."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -315,6 +348,7 @@ msgstr ""
 "Si hace ssh-keysign SUID, podrá usar la autentificiación basada en servidor "
 "de la versión 2 del protocolo SSH."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -324,16 +358,19 @@ 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
 #: ../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?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 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:137
 msgid ""
@@ -343,6 +380,7 @@ msgstr ""
 "Generalmente, el servidor de ssh (Secure Shell Server) se ejecuta para "
 "permitir el acceso remoto mediante ssh."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -354,11 +392,13 @@ msgstr ""
 "sistema y no quiere acceder a él mediante ssh, entonces puede desactivar "
 "sshd."
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr "Las opciones de entorno para las claves, en desuso"
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -372,6 +412,7 @@ msgstr ""
 "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:149
 msgid ""
diff --git a/debian/po/fr.po b/debian/po/fr.po
index d72a5d5d7..5e705f40a 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,9 +13,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openssh 3.6.1p2-2\n"
+"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-11-15 15:36+0000\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"
@@ -23,11 +23,13 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Séparation des privilèges"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -39,11 +41,13 @@ msgstr ""
 "désactiver, vous devez ajouter « UsePrivilegeSeparation no » dans /etc/ssh/"
 "sshd_config."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Activer la séparation des privilèges"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -56,6 +60,7 @@ msgstr ""
 "s'exécutant en tant que super-utilisateur, et donc réduit l'impact des trous "
 "de sécurité dans sshd."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -68,27 +73,28 @@ msgstr ""
 "utilisateur (pam_mkhomedir, par exemple) ne s'exécuteront pas, et "
 "l'authentification interactive au clavier ne fonctionnera pas."
 
+#. Type: boolean
 #. 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 ""
-"Comme vous souhaitez que je génère le fichier de configuration sshd_config à "
-"votre place, vous pouvez choisir d'activer ou non l'option de séparation des "
-"privilèges. Si vous utilisez un noyau 2.0 (dans ce cas vous *devez* "
-"désactiver cette option ou alors sshd ne se lancera pas) ou bien si vous "
-"avez besoin de fonctionnalités PAM, cela ne fonctionnera pas si cette option "
-"est activée, dans le cas contraire vous devriez l'activer."
+"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 "
+"des privilèges. Si vous êtes sûr d'avoir besoin de fonctionnalités PAM, cela "
+"ne fonctionnera pas si cette option est activée. Dans le cas contraire vous "
+"devriez l'activer."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Créer un nouveau fichier de configuration"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -105,6 +111,7 @@ msgstr ""
 "config) qui marchera avec la nouvelle version du serveur, mais ne contiendra "
 "aucun des réglages que vous avez faits sur l'ancienne version."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -122,6 +129,7 @@ msgstr ""
 "d'informations), mais vous pouvez toujours éditer le fichier sshd_config et "
 "changer cela."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -131,11 +139,13 @@ msgstr ""
 "Il est fortement recommandé que vous me laissiez générer le nouveau fichier "
 "de configuration."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Autoriser la version 2 du protocole SSH uniquement"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -150,6 +160,7 @@ msgstr ""
 "de vieilles versions de la partie cliente de se connecter (le client ssh de "
 "la distribution Debian « Potato » en fait partie)."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -160,6 +171,7 @@ msgstr ""
 "et vous ne pourrez pas les utiliser si vous n'autorisez que les connexions "
 "utilisant la version 2 du protocole."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -170,11 +182,13 @@ msgstr ""
 "instructions fournies dans le fichier README.Debian vous indiquent comment "
 "modifier le fichier sshd_config."
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "Clés pour ssh2 fusionnées dans les fichiers de configuration"
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -187,12 +201,14 @@ msgstr ""
 "known_hosts2 ne sont plus utiles. Ils seront néanmoins lus afin de préserver "
 "la compatibilité descendante."
 
+#. Type: boolean
 #. 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) ?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -204,6 +220,7 @@ msgstr ""
 "vraisemblablement tuer toutes les instances de sshd en cours. Si vous étiez "
 "en train de faire cette mise à niveau à l'aide de ssh, ce serait regrettable."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -214,12 +231,14 @@ msgstr ""
 "run/sshd.pid » à la ligne « start-stop-daemon » dans la section « stop » du "
 "fichier."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:88
 msgid ""
@@ -229,6 +248,7 @@ msgstr ""
 "Pour des raisons de sécurité, la version Debian de ssh positionne les "
 "options ForwardX11 et ForwardAgent à « Off » par défaut."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -239,12 +259,14 @@ msgstr ""
 "confiance, soit dans un des fichiers de configuration, soit avec l'option -X "
 "de la ligne de commande."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
@@ -252,6 +274,7 @@ msgstr ""
 "Attention : rsh-server est installé -- ce n'est probablement pas une bonne "
 "idée"
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid ""
@@ -262,12 +285,14 @@ msgstr ""
 "probablement obtenir en installant ssh. Je vous conseille de supprimer ce "
 "paquet."
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 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:106
 msgid ""
@@ -281,11 +306,13 @@ msgstr ""
 "au moins une chance que les sessions telnet soient chiffrées et que les mots "
 "de passe et noms d'utilisateurs ne passent pas en clair sur le réseau."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 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:114
 msgid ""
@@ -297,11 +324,13 @@ msgstr ""
 "ne peut utiliser ce fichier de clé, et je ne peux trouver l'utilitaire ssh-"
 "keygen de l'installation précédente (non libre) de SSH."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 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:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
@@ -309,6 +338,7 @@ msgstr ""
 "Voulez-vous que /usr/lib/ssh-keysign soit installé avec le bit SETUID "
 "activé ?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -317,6 +347,7 @@ msgid ""
 msgstr ""
 "Vous avez la possibilité d'installer ssh-keysign avec le bit SETUID activé."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -327,6 +358,7 @@ msgstr ""
 "l'authentification basée sur les hôtes, disponible dans la version 2 du "
 "protocole SSH."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -337,16 +369,19 @@ msgstr ""
 "cela vous pose des problèmes, vous pourrez revenir sur votre décision avec "
 "« dpkg-reconfigure ssh »."
 
+#. Type: boolean
 #. 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 ?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 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:137
 msgid ""
@@ -356,6 +391,7 @@ msgstr ""
 "Normalement le serveur sshd est lancé pour permettre les connexions "
 "distantes via ssh."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -367,11 +403,13 @@ msgstr ""
 "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:149
 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:149
 msgid ""
@@ -386,6 +424,7 @@ msgstr ""
 "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:149
 msgid ""
diff --git a/debian/po/ja.po b/debian/po/ja.po
index dcead1cdb..4daed7a37 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -11,24 +11,25 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-27 02:20+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"
+"POT-Creation-Date: 2003-11-15 15:36+0000\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Æø¢¤ÎʬΥ"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -36,14 +37,16 @@ msgid ""
 "turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
 "sshd_config."
 msgstr ""
-"Æø¢Ê¬Î¥¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Ìµ¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ /etc/ssh/"
-"sshd_conf ¤Ë¡ÖUsePrivilegeSeparation no¡×¤È¤¤¤¦¹Ô¤òÄɲà ¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"Æø¢Ê¬Î¥¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Ìµ¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢/etc/ssh/"
+"sshd_conf ¤Ë¡ÖUsePrivilegeSeparation no¡×¤È¤¤¤¦¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Æø¢Ê¬Î¥¤òÍ­¸ú¤Ë¤¹¤ë"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -52,9 +55,10 @@ msgid ""
 "reduces the impact of security holes in sshd."
 msgstr ""
 "ËܥС¼¥¸¥ç¥ó¤Î OpenSSH ¤Ï¡¢¿·¤·¤¤Æø¢Ê¬Î¥¥ª¥×¥·¥ç¥ó¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£ ¤³¤ì¤Ë"
-"¤è¤Ã¤Æ¡¢root ¸¢¸Â¤Ç¼Â¹Ô¤µ¤ì¤ë¥³¡¼¥É¤ÎÎ̤òÂçÉý¤Ë¸º¤é¤¹¤³¤È¤¬ ¤Ç¤­¡¢sshd ¤Î¥»"
+"¤è¤Ã¤Æ¡¢root ¸¢¸Â¤Ç¼Â¹Ô¤µ¤ì¤ë¥³¡¼¥É¤ÎÎ̤òÂçÉý¤Ë¸º¤é¤¹¤³¤È¤¬¤Ç¤­¡¢sshd ¤Î¥»"
 "¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤Î±Æ¶Á¤ò¸º¤é¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -62,29 +66,31 @@ msgid ""
 "session modules that need to run as root (pam_mkhomedir, for example) will "
 "fail, and PAM keyboard-interactive authentication won't work."
 msgstr ""
-"»ÄÇ°¤Ê¤³¤È¤Ë¡¢Æø¢Ê¬Î¥¤Ï PAM ¤Ë°­±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£root ¤Ç¼Â¹Ô¤µ¤ì¤ë Á´¤Æ¤Î "
-"PAM ¥»¥Ã¥·¥ç¥ó¥â¥¸¥å¡¼¥ë (Î㤨¤Ð pam_mkhomedir) ¤ÏÆ°¤«¤Ê¤¯ ¤Ê¤ê¤Þ¤¹¡£¤Þ¤¿¡¢"
+"»ÄÇ°¤Ê¤³¤È¤Ë¡¢Æø¢Ê¬Î¥¤Ï PAM ¤Ë°­±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£root ¤Ç¼Â¹Ô¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î "
+"PAM ¥»¥Ã¥·¥ç¥ó¥â¥¸¥å¡¼¥ë (¤¿¤È¤¨¤Ð pam_mkhomedir) ¤ÏÆ°¤«¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£¤Þ¤¿¡¢"
 "PAM ¥­¡¼¥Ü¡¼¥ÉÂÐÏÃŪǧ¾Ú¤âÆ°ºî¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£"
 
+#. Type: boolean
 #. 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 ¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤òÁªÂò¤·¤Þ¤·¤¿¤Î¤Ç¡¢ ¤³¤³¤ÇÆÃ"
-"¸¢Ê¬Î¥¤òÍ­¸ú¤Ë¤¹¤ë¤«¤·¤Ê¤¤¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£2.0 ·ÏÎó¤Î ¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë"
-"¤« (¤³¤Î¾ì¹ç¤Ë¤Ï¡Ö¤¤¤¤¤¨¡×¤òÁª¤Ð¤Ê¤¤¤È sshd ¤Ïµ¯Æ°¤¹¤é¤·¤Þ¤»¤ó)¡¢PAM ¤Îµ¡Ç½¤Î"
-"¤¦¤ÁÆø¢Ê¬Î¥¤È¶¦Â¸¤Ç¤­¤Ê¤¤µ¡Ç½¤ò »È¤¤¤¿¤¤¾ì¹ç°Ê³°¤Ï¡¢¡Ö¤Ï¤¤¡×¤òÁª¤Ö¤Ù¤­¤Ç¤¹¡£"
+"sshd_config ¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤òÁªÂò¤·¤¿¤Î¤Ç¡¢ ¤³¤³¤ÇÆø¢Ê¬Î¥¤òÍ­¸ú¤Ë"
+"¤¹¤ë¤«¤·¤Ê¤¤¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£PAM ¤Îµ¡Ç½¤Î¤¦¤ÁÆø¢Ê¬Î¥¤È¶¦Â¸¤Ç¤­¤Ê¤¤µ¡Ç½¤ò»È"
+"¤¤¤¿¤¤¾ì¹ç°Ê³°¤Ï¡¢¡Ö¤Ï¤¤¡×¤òÁª¤Ö¤Ù¤­¤Ç¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤òºî¤ê¤Þ¤¹"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -95,12 +101,13 @@ msgid ""
 "any customisations you made with the old version."
 msgstr ""
 "OpenSSH ¤Î¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢Debian 'Potato' ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó (¤¤¤Þ¡¢"
-"¤½¤Î¥Ð¡¼¥¸¥ç¥ó¤«¤é¤Î¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¤ò»î¤ß¤Æ¤¤¤ë¤È¤³¤í) ¤«¤é¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤¬"
-"ÂçÉý¤ËÊѲ½¤·¤Æ¤¤¤Þ¤¹¡£¤¤¤Þ¡¢¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥µ¡¼¥Ð¤Ç »È¤¦¤³¤È¤¬¤Ç¤­¤ë¿·¤·¤¤"
-"ÀßÄê¥Õ¥¡¥¤¥ë (/etc/ssh/sshd/config) ¤ò¼«Æ°À¸À® ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤½¤Î¥Õ¥¡"
-"¥¤¥ë¤Ï¡¢¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ë ´Þ¤Þ¤ì¤ë¤¢¤Ê¤¿¤ÎÀßÄ꤬Á´¤¯´Þ¤Þ¤ì¤Þ¤»"
-"¤ó¡£"
+"¤½¤Î¥Ð¡¼¥¸¥ç¥ó¤«¤é¤Î¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¤ò»î¤ß¤Æ¤¤¤ë¤È¤³¤í) ¤«¤é¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤¬"
+"ÂçÉý¤ËÊѲ½¤·¤Æ¤¤¤Þ¤¹¡£¤¤¤Þ¡¢¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥µ¡¼¥Ð¤Ç»È¤¦¤³¤È¤¬¤Ç¤­¤ë¿·¤·¤¤"
+"ÀßÄê¥Õ¥¡¥¤¥ë (/etc/ssh/sshd/config) ¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤½¤Î¥Õ¥¡"
+"¥¤¥ë¤Ï¡¢¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¤¢¤Ê¤¿¤ÎÀßÄ꤬¤Þ¤Ã¤¿¤¯´Þ¤Þ¤ì¤Þ"
+"¤»¤ó¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -110,11 +117,12 @@ msgid ""
 "the correct default (see README.Debian for more details), but you can always "
 "edit sshd_config and set it to no if you wish."
 msgstr ""
-"¤³¤Î¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¡¢¡ÖPermitRootLogin¡×¤ò¡Öyes¡×¤ËÀßÄꤷ¤Þ¤¹¡£ (¤Ä¤Þ"
-"¤ê¡¢root ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÃΤäƤ¤¤ë¿Í¤Ê¤éï¤Ç¤âľÀÜ¥í¥°¥¤¥ó¤Ç¤­¤Þ ¤¹)¡£¤³¤ì¤Ç¤è"
-"¤¤¡¢¤È¤¤¤¦¤Î¤¬¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥ó¥Æ¥Ê¤Î°Õ¸«¤Ç¤¹¤¬ (¾Ü¤· ¤¯¤Ï README.Debian "
-"¤òÆɤó¤Ç²¼¤µ¤¤)¡¢sshd_config ¤òÊÔ½¸¤·¤Æ¡Öno¡×¤ËÀß Äꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£"
+"¤³¤Î¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¡¢¡ÖPermitRootLogin¡×¤ò¡Öyes¡×¤ËÀßÄꤷ¤Þ¤¹ (¤Ä¤Þ¤ê¡¢"
+"root ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÃΤäƤ¤¤ë¿Í¤Ê¤éï¤Ç¤âľÀÜ¥í¥°¥¤¥ó¤Ç¤­¤Þ¤¹)¡£¤³¤ì¤Ç¤è¤¤¡¢"
+"¤È¤¤¤¦¤Î¤¬¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥ó¥Æ¥Ê¤Î°Õ¸«¤Ç¤¹¤¬ (¾Ü¤·¤¯¤Ï README.Debian ¤òÆɤó"
+"¤Ç¤¯¤À¤µ¤¤)¡¢sshd_config ¤òÊÔ½¸¤·¤Æ¡Öno¡×¤ËÀßÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -122,11 +130,13 @@ msgid ""
 "for you."
 msgstr "¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤ò¶¯¤¯¤ª´«¤á¤·¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "SSH ¥×¥í¥È¥³¥ë 2 ¤Î¤ß¤òµö²Ä¤·¤Þ¤¹"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -136,33 +146,37 @@ msgid ""
 "connecting (the ssh client shipped with \"potato\" is affected)."
 msgstr ""
 "OpenSSH ¤Î¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢¤º¤Ã¤È°ÂÁ´¤Ê¡¢ssh ¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2 ¤ò¥µ"
-"¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ssh 1 ¤ò¶Ø»ß¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¤¬¡¢ÃÙ¤¤¥Þ ¥·¥ó¤Ç¤ÏÆ°ºî¤¬"
-"ÃÙ¤¯¤Ê¤Ã¤¿¤ê¡¢¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤«¤éÀܳ¤Ç¤­¤Ê¤¯¤Ê¤Ã¤¿¤ê ¤·¤Þ¤¹ (\"potato\" ¤Î "
+"¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ssh 1 ¤ò¶Ø»ß¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¤¬¡¢ÃÙ¤¤¥Þ¥·¥ó¤Ç¤ÏÆ°ºî¤¬"
+"ÃÙ¤¯¤Ê¤Ã¤¿¤ê¡¢¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤«¤éÀܳ¤Ç¤­¤Ê¤¯¤Ê¤Ã¤¿¤ê¤·¤Þ¤¹ (\"potato\" ¤Î "
 "ssh ¥¯¥é¥¤¥¢¥ó¥È¤âÀܳ¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹)¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 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."
 msgstr ""
-"¤Þ¤¿¡¢¥×¥í¥È¥³¥ë 1 ¤Ç»È¤¦¥­¡¼¤Ï°Û¤Ê¤ë¤¿¤á¡¢¥×¥í¥È¥³¥ë 2 ¤òÍ­¸ú¤Ë¤·¤¿ ¤À¤±¤Ç¤Ï"
+"¤Þ¤¿¡¢¥×¥í¥È¥³¥ë 1 ¤Ç»È¤¦¥­¡¼¤Ï°Û¤Ê¤ë¤¿¤á¡¢¥×¥í¥È¥³¥ë 2 ¤òÍ­¸ú¤Ë¤·¤¿¤À¤±¤Ç¤Ï"
 "¤½¤Î¥­¡¼¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
-"¤â¤·º£¸å¤¢¤Ê¤¿¤¬¹Í¤¨¤òÊѤ¨¤¿¤é¡¢README.Debian ¤òÆɤà¤È sshd_config ¤ò ¤É¤Î¤è"
-"¤¦¤ËÊѹ¹¤·¤¿¤é¤è¤¤¤«¤¬Ê¬¤«¤ê¤Þ¤¹¡£"
+"¤â¤·º£¸å¤¢¤Ê¤¿¤¬¹Í¤¨¤òÊѤ¨¤¿¤é¡¢README.Debian ¤òÆɤà¤È sshd_config ¤ò¤É¤Î¤è¤¦"
+"¤ËÊѹ¹¤·¤¿¤é¤è¤¤¤«¤¬Ê¬¤«¤ê¤Þ¤¹¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "ssh2 ¥­¡¼¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤ËÅý¹ç¤µ¤ì¤Þ¤¹"
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -170,15 +184,17 @@ msgid ""
 "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 ¥Õ¥¡¥¤¥ë¤Ï¤â ¤Ï¤äÉÔÍפȤʤê"
-"¤Þ¤·¤¿¡£¸åÊý¸ß´¹À­¤òÊݤĤ¿¤á¤Ë¤Ï¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤¬É¬Í× ¤Ç¤¹¡£"
+"OpenSSH ¤Î¥Ð¡¼¥¸¥ç¥ó 3 ¤Ï¡¢ssh1 ¤È ssh2 ¤Î¥­¡¼¤Ë¸ÄÊ̤Υե¡¥¤¥ë¤ò»È¤¤¤Þ¤»¤ó¡£"
+"¤Ä¤Þ¤ê¡¢authorized_keys2 ¥Õ¥¡¥¤¥ë¤È known_hosts2 ¥Õ¥¡¥¤¥ë¤Ï¤â¤Ï¤äÉÔÍפȤʤê¤Þ"
+"¤·¤¿¡£¸åÊý¸ß´¹À­¤òÊݤĤ¿¤á¤Ë¤Ï¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
-msgid "Do you want to continue (and risk killing active ssh sessions) ?"
-msgstr "³¤±¤Æ¤¤¤¤¤Ç¤¹¤« (ÀܳÃæ¤Î ssh ¥»¥Ã¥·¥ç¥ó¤¬ÀÚ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)"
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
+msgstr "³¤±¤Æ¤è¤¤¤Ç¤¹¤« (ÀܳÃæ¤Î ssh ¥»¥Ã¥·¥ç¥ó¤¬ÀÚ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -186,10 +202,11 @@ msgid ""
 "all running sshd instances.  If you are doing this upgrade via an ssh "
 "session, that would be a Bad Thing(tm)."
 msgstr ""
-"¤¤¤Þ¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ /etc/init.d/ssh ¤Ï¡¢¤ª¤½¤é¤¯¼Â¹ÔÃæ¤Î sshd ¤òÁ´¤Æ Ää»ß¤µ"
-"¤»¤Þ¤¹¡£¤³¤Î¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¤ò ssh ¥»¥Ã¥·¥ç¥ó¤òÍѤ¤¤Æ¹Ô¤¦¤Î¤Ï´Ö °ã¤Ã¤¿¤ä¤ê¤«"
-"¤¿¤Ç¤¹¡£"
+"¤¤¤Þ¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ /etc/init.d/ssh ¤Ï¡¢¤ª¤½¤é¤¯¼Â¹ÔÃæ¤Î sshd ¤ò¤¹¤Ù¤ÆÄä»ß¤µ"
+"¤»¤Þ¤¹¡£¤³¤Î¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¤ò ssh ¥»¥Ã¥·¥ç¥ó¤òÍѤ¤¤Æ¹Ô¤¦¤Î¤Ï´Ö°ã¤Ã¤¿¤ä¤ê¤«¤¿"
+"¤Ç¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -199,11 +216,13 @@ msgstr ""
 "¤³¤Î¾õ¶·¤ò½¤Àµ¤¹¤ë¤Ë¤Ï¡¢/etc/init.d/ssh ¤Î stop ¥»¥¯¥·¥ç¥ó¤Î start-stop-"
 "daemon ¤Î¹Ô¤Ë¡Ö--pidfile /var/run/sshd.pid¡×¤ÈÄɲä·¤Þ¤¹¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "Ãí°Õ: X11 ¤Èǧ¾Ú¤Î¥Õ¥©¥ï¡¼¥Ç¥£¥ó¥°¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¶Ø»ß¤µ¤ì¤Þ¤¹"
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -213,41 +232,47 @@ msgstr ""
 "¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤«¤é¡¢Debian ¤Î ssh ¤Ç¤Ï ForwardX11 ¤È ForwardAgent ¤Ï¥Ç"
 "¥Õ¥©¥ë¥È¤Ç¤Ï¡Öoff¡×¤ËÀßÄꤵ¤ì¤Þ¤¹¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
 msgstr ""
-"ÀßÄê¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤¿¤ê¡¢-X ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤¿¤ê¤¹¤ë ¤³¤È¤Ç¡¢¿®"
-"ÍѤǤ­¤ë¥µ¡¼¥Ð¤ËÂФ·¤Æµö²Ä¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
+"ÀßÄê¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤¿¤ê¡¢-X ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤¿¤ê¤¹¤ë¤³¤È¤Ç¡¢¿®ÍÑ"
+"¤Ç¤­¤ë¥µ¡¼¥Ð¤ËÂФ·¤Æµö²Ä¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
-msgstr "¾ÜºÙ¤Ï /usr/share/doc/ssh/README.Debian ¤òÆɤó¤Ç²¼¤µ¤¤¡£"
+msgstr "¾ÜºÙ¤Ï /usr/share/doc/ssh/README.Debian ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "·Ù¹ð: rsh-server ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤Ö¤óÎɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 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."
 msgstr ""
-"rsh-server ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤È¡¢¤¢¤Ê¤¿¤¬ ssh ¤Ë¤è¤Ã¤ÆÆÀ¤¿¤¤¤È »×¤Ã¤Æ¤¤"
-"¤ë¤Ç¤¢¤í¤¦¥»¥­¥å¥ê¥Æ¥£¤¬Â»¤Ê¤ï¤ì¤Þ¤¹¡£¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¢¥ó¥¤ ¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³"
+"rsh-server ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤È¡¢¤¢¤Ê¤¿¤¬ ssh ¤Ë¤è¤Ã¤ÆÆÀ¤¿¤¤¤È»×¤Ã¤Æ¤¤"
+"¤ë¤Ç¤¢¤í¤¦¥»¥­¥å¥ê¥Æ¥£¤¬Â»¤Ê¤ï¤ì¤Þ¤¹¡£¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³"
 "¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "·Ù¹ð: telnetd ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤Ö¤óÎɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid ""
@@ -258,14 +283,16 @@ msgid ""
 msgstr ""
 "(¤â¤· telnet ¥¢¥¯¥»¥¹¤òÄ󶡤·¤¿¤¤¤È»×¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤·¤¿¤é) telnetd ¥Ñ¥Ã¥±¡¼¥¸"
 "¤ò¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¡¢¤Þ¤¿¤Ï¡¢telnetd-ssh ¥Ñ¥Ã¥±¡¼¥¸¤ò ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¾¯"
-"¤Ê¤¯¤È¤â¥Í¥Ã¥È¥ï¡¼¥¯¾å¤ò°Å¹æ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¥æ¡¼¥¶Ì¾ ¤ä¥Ñ¥¹¥ï¡¼¥É¤ä¥»¥Ã¥·¥ç¥ó¾ð"
+"¤Ê¤¯¤È¤â¥Í¥Ã¥È¥ï¡¼¥¯¾å¤ò°Å¹æ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¥æ¡¼¥¶Ì¾¤ä¥Ñ¥¹¥ï¡¼¥É¤ä¥»¥Ã¥·¥ç¥ó¾ð"
 "Êó¤¬Î®¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "·Ù¹ð: ¿·¤·¤¤¥Û¥¹¥È¥­¡¼¤òºî¤é¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid ""
@@ -274,37 +301,42 @@ msgid ""
 "the old (non-free) SSH installation."
 msgstr ""
 "IDEA ¤Ç°Å¹æ²½¤µ¤ì¤¿¸Å¤¤¥­¡¼¤¬ /etc/ssh/ssh_host_key ¤Ë¤¢¤ê¤Þ¤¹¡£ OpenSSH ¤Ï¤³"
-"¤Î¥Û¥¹¥È¥­¡¼¥Õ¥¡¥¤¥ë¤ò°·¤¨¤Þ¤»¤ó¡£¤Þ¤¿¡¢º£¥¤¥ó¥¹¥È¡¼¥ë ¤µ¤ì¤Æ¤¤¤ë¸Å¤¤ (¥Õ¥ê¡¼"
-"¤Ç¤Ï¤Ê¤¤) SSH ¤Ë¤Ï ssh-keygen ¥æ¡¼¥Æ¥£¥ê¥Æ¥£ ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
+"¤Î¥Û¥¹¥È¥­¡¼¥Õ¥¡¥¤¥ë¤ò°·¤¨¤Þ¤»¤ó¡£¤Þ¤¿¡¢º£¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¸Å¤¤ (¥Õ¥ê¡¼"
+"¤Ç¤Ï¤Ê¤¤) SSH ¤Ë¤Ï ssh-keygen ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "¿·¤·¤¤¥Û¥¹¥È¥­¡¼¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "/usr/bin/ssh-keysign ¤ò SUID root ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
 msgstr ""
-"ssh-keysign ¥Ø¥ë¥Ñ¡¼¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¡¢SUID ¥Ó¥Ã¥È¤òÀßÄꤹ¤ë¤« ¤·¤Ê¤¤¤«¤ò"
-"Áª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
+"ssh-keysign ¥Ø¥ë¥Ñ¡¼¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¡¢SUID ¥Ó¥Ã¥È¤òÀßÄꤹ¤ë¤«¤·¤Ê¤¤¤«¤òÁª"
+"¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 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 ¤Î¥Û¥¹¥È¤Ë ´ð¤Å¤¯Ç§¾Ú¤ò"
-"»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
+"ssh-keysign ¤ò SUID ¤ËÀßÄꤷ¤¿¾ì¹ç¡¢SSH ¥×¥í¥È¥³¥ë 2 ¤Î¥Û¥¹¥È¤Ë´ð¤Å¤¯Ç§¾Ú¤ò»È"
+"¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -312,27 +344,31 @@ msgid ""
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
 "¤è¤¯Ê¬¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢SUID ¤òÍ­¸ú¤Ë¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£¤â¤· ÌäÂ꤬µ¯¤³¤ì"
-"¤Ð¡¢dpkg-reconfigure ssh ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ÇÀßÄê¤òÊѹ¹ ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
+"¤Ð¡¢dpkg-reconfigure ssh ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ÇÀßÄê¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr "sshd ¥µ¡¼¥Ð¤ò¼Â¹Ô¤·¤Þ¤¹¤«?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ssh ¥¯¥é¥¤¥¢¥ó¥È¤È sshd ¥µ¡¼¥Ð¤ÎξÊý¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
 msgstr ""
-"Ä̾sshd ¥»¥­¥å¥¢¥·¥§¥ë¥µ¡¼¥Ð¤Ï¡¢ssh ¤òÍѤ¤¤¿¥ê¥â¡¼¥È¤«¤é¤Î¥í¥°¥¤¥ó ¤ò²Äǽ"
-"¤Ë¤¹¤ë¤¿¤á¤Ë¼Â¹Ô¤·¤Þ¤¹¡£"
+"Ä̾sshd ¥»¥­¥å¥¢¥·¥§¥ë¥µ¡¼¥Ð¤Ï¡¢ssh ¤òÍѤ¤¤¿¥ê¥â¡¼¥È¤«¤é¤Î¥í¥°¥¤¥ó¤ò²Äǽ¤Ë"
+"¤¹¤ë¤¿¤á¤Ë¼Â¹Ô¤·¤Þ¤¹¡£"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -340,15 +376,17 @@ msgid ""
 "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 ¤ò¼Â¹Ô¤·¤Ê¤¤¤Ç"
-"¤ª¤­¤Þ¤¹¡£"
+"¤â¤· ssh ¥¯¥é¥¤¥¢¥ó¥È¤ò»È¤Ã¤Æ¤³¤Î¥Þ¥·¥ó¤«¤é¾¥Þ¥·¥ó¤Ø¤ÈÀܳ¤¹¤ë¤À¤±¤Ç¡¢¤³¤Î¥Þ"
+"¥·¥ó¤Ø¤È ssh ¤ò»È¤Ã¤Æ¥í¥°¥¤¥ó¤·¤Ê¤¤¤Î¤Ç¤·¤¿¤é¡¢¤³¤³¤Ç sshd ¤ò¼Â¹Ô¤·¤Ê¤¤¤Ç¤ª¤­"
+"¤Þ¤¹¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr "¸°¤Î´Ä¶­¥ª¥×¥·¥ç¥ó¤Ï̵¸ú¤ËÀßÄꤵ¤ì¤Þ¤·¤¿"
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -357,11 +395,12 @@ msgid ""
 "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 ¥Õ¥¡¥¤"
-"¥ë¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò½üµî¤·¤Ê¤¤¸Â¤ê¤Ï¤½¤Î¸°"
-"¤ÏÍøÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ ¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"ËܥС¼¥¸¥ç¥ó¤Î OpenSSH ¤Ï¡¢¸ø³«¸°¤Î´Ä¶­¥ª¥×¥·¥ç¥ó¤ò¥Ç¥Õ¥©¥ë¥È¤Ç̵¸ú¤ËÀßÄꤷ¤Æ"
+"¤¤¤Þ¤¹¡£LD_PRELOAD ¤Ê¤É¤Î¹¶·â¤òÈò¤±¤ë¤¿¤á¤Ç¤¹¡£¤â¤· authorized_keys ¥Õ¥¡¥¤¥ë"
+"¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò½üµî¤·¤Ê¤¤¸Â¤ê¤Ï¤½¤Î¸°¤Ï"
+"ÍøÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -369,15 +408,6 @@ msgid ""
 "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 ""
-#~ "NB! If you are running a 2.0 series Linux kernel, then privilege "
-#~ "separation will not work at all, and your sshd will fail to start unless "
-#~ "you explicitly turn privilege separation off."
-#~ msgstr ""
-#~ "Ãí°Õ! Linux ¥«¡¼¥Í¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2.0 ·ÏÎó¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢Æø¢ ʬΥ¤ÏÁ´¤¯"
-#~ "Æ°ºî¤·¤Þ¤»¤ó¡£ÌÀ¼¨Åª¤ËÆø¢Ê¬Î¥¤ò̵¸ú¤Ë¤·¤Ê¤¤¸Â¤ê¡¢sshd ¤Ïµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ"
-#~ "¤¹¡£"
+"¤³¤Î¥ª¥×¥·¥ç¥ó¤òºÆ¤ÓÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É½ªÎ»¸å¤Ë¡¢sshd_config(5) ¥Þ"
+"¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Î·Ù¹ð»ö¹à¤òÆɤó¤Ç¡¢ /etc/ssh/sshd_config ¥Õ¥¡¥¤¥ë¤Ë"
+"¡ÖPermitUserEnvironment yes¡×¤ÈÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 000000000..7feae18c1
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,429 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openssh 3.6.1p2-9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-11-15 15:36+0000\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates.master:3
+msgid "Privilege separation"
+msgstr "Rechtenscheiding"
+
+#. Type: note
+#. Description
+#: ../templates.master:3
+msgid ""
+"Privilege separation is turned on by default, so if you decide you want it "
+"turned off, you need to add \"UsePrivilegeSeparation no\" to /etc/ssh/"
+"sshd_config."
+msgstr ""
+"Rechtenscheiding is standaard ingeschakeld; mocht u dit niet willen, dan "
+"dient u \"UsePrivilegeSeparation no\" toe te voegen in /etc/ssh/sshd_config."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:19
+msgid "Enable Privilege separation"
+msgstr "Rechtenscheiding inschakelen"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:19
+msgid ""
+"This version of OpenSSH contains the new privilege separation option. This "
+"significantly reduces the quantity of code that runs as root, and therefore "
+"reduces the impact of security holes in sshd."
+msgstr ""
+"Deze OpenSSH-versie bevat de nieuwe rechtenscheidingoptie. Deze vermindert "
+"de hoeveelheid code die als root uitgevoerd wordt substantieel, en "
+"vermindert op die manier de invloed van veiligheidslekken in sshd."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:19
+msgid ""
+"Unfortunately, privilege separation interacts badly with PAM. Any PAM "
+"session modules that need to run as root (pam_mkhomedir, for example) will "
+"fail, and PAM keyboard-interactive authentication won't work."
+msgstr ""
+"Spijtig genoeg werkt rechtenscheiding niet goed samen met PAM. Alle PAM-"
+"sessiemodules die als root uitgevoerd dienen te worden (b.v. pam_mkhomedir) "
+"zullen falen, en de interactieve PAM-toetsenbord-authenticatie zal ook niet "
+"werken."
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"you know you need to use PAM features that won't work with this option, you "
+"should enable it."
+msgstr ""
+"Aangezien u ervoor gekozen heeft om mij een ssh_config-bestand voor u te "
+"laten genereren, kunt u kiezen of u rechtenscheiding aan of uit wilt hebben. "
+"U kunt dit het best activeren, tenzij u PAM-mogelijkheden nodig heeft die "
+"niet met rechtenscheiding samenwerken."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid "Generate new configuration file"
+msgstr "Genereer het nieuwe configuratiebestand"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid ""
+"This version of OpenSSH has a considerably changed configuration file from "
+"the version shipped in Debian 'Potato', which you appear to be upgrading "
+"from. I can now generate you a new configuration file (/etc/ssh/sshd."
+"config), which will work with the new server version, but will not contain "
+"any customisations you made with the old version."
+msgstr ""
+"Deze versie van OpenSSH gebruikt een configuratiebestand dat sterk veranderd "
+"is ten opzichte van dat in Debian 'Potato' (waarvan u lijkt op te "
+"waardereren). Ik kan nu een nieuw, met de nieuwe serverversie werkend, "
+"configuratiebestand (/etc/ssh/sshd.config) voor u genereren. Dit "
+"gegenereerde bestand zal echter de aanpassingen die u wellicht gemaakt had "
+"niet overnemen."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid ""
+"Please note that this new configuration file will set the value of "
+"'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
+"ssh directly in as root). It is the opinion of the maintainer that this is "
+"the correct default (see README.Debian for more details), but you can always "
+"edit sshd_config and set it to no if you wish."
+msgstr ""
+"Merk op dat dit nieuwe configuratiebestand de waarde van 'PermitRootLogin' "
+"op 'yes' zet (wat betekent dat iedereen die het root-wachtwoord kent via ssh "
+"rechstreeks als root kan aanmelden). Het is de mening van de pakketbeheerder "
+"dat dit de juiste defaultwaarde is (zie README.Debian.gz voor meer details). "
+"Indien u dit niet wenst kunt u sshd_config handmatig aanpassen en de waarde "
+"op 'no' zetten."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid ""
+"It is strongly recommended that you let me generate a new configuration file "
+"for you."
+msgstr ""
+"Het wordt ten zeerste aangeraden om mij het nieuwe configuratiebestand voor "
+"u te laten genereren."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:55
+msgid "Allow SSH protocol 2 only"
+msgstr "Laat enkel versie 2 van het SSH-protocol toe."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:55
+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 "
+"things down on low end machines and might prevent older clients from "
+"connecting (the ssh client shipped with \"potato\" is affected)."
+msgstr ""
+"Deze versie van OpenSSH ondersteunt de veiligere versie 2 van het ssh-"
+"protocol. Uitschakelen van ssh versie 1 wordt aangemoedigd, hoewel dit "
+"dingen op zwakkere machines zal vertragen, en mogelijk verbindingen van "
+"oudere clients (b.v. de ssh-client uit \"potato\") onmogelijk maakt."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:55
+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."
+msgstr ""
+"Houd er ook rekening mee dat de sleutels gebruikt voor protocolversie 1 "
+"verschillend zijn, waardoor u deze niet kunt gebruiken indien u enkel "
+"protocolversie 2 verbindingen toelaat."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:55
+msgid ""
+"If you later change your mind about this setting, README.Debian has "
+"instructions on what to do to your sshd_config file."
+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:69
+msgid "ssh2 keys merged in configuration files"
+msgstr "ssh2 sleutels zijn samengevoegd in de configuratiebestanden"
+
+#. Type: note
+#. Description
+#: ../templates.master:69
+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:78
+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:78
+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 "
+"session, that would be a Bad Thing(tm)."
+msgstr ""
+"De /etc/init.d/ssh versie die u geïnstalleerd hebt schiet waarschijnlijk "
+"alle lopende sshd-instanties af. Dit is Niet Goed wanneer u deze "
+"opwaardering via een ssh-sessie doet."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:78
+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."
+msgstr ""
+"U kunt dit repareren door \"--pidfile /var/run/sshd.pid\" toe te voegen aan "
+"de start-stop-daemon regel in de stop-sectie van het bestand."
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+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:88
+msgid ""
+"For security reasons, the Debian version of ssh has ForwardX11 and "
+"ForwardAgent set to ``off'' by default."
+msgstr ""
+"Om beveiligingsredenen zijn, in de Debian versie van ssh, ForwardX11 en "
+"ForwardAgent standaard uitgeschakeld."
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+msgid ""
+"You can enable it for servers you trust, either in one of the configuration "
+"files, or with the -X command line option."
+msgstr ""
+"U kunt dit, voor vertrouwde servers, inschakelen in de "
+"configuratiebestanden, of met de -X commandoregeloptie."
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+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:99
+msgid "Warning: rsh-server is installed --- probably not a good idea"
+msgstr ""
+"Waarschuwing: rsh-server is geïnstalleerd -- dit is waarschijnlijk geen goed "
+"idee"
+
+#. Type: note
+#. Description
+#: ../templates.master:99
+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."
+msgstr ""
+"rsh-server geïnstalleerd hebben ondermijnt de beveiliging die u, "
+"waarschijnlijk, net probeerde te verkrijgen door ssh te installeren. We "
+"raden u aan om dat pakket te verwijderen."
+
+#. Type: note
+#. Description
+#: ../templates.master:106
+msgid "Warning: telnetd is installed --- probably not a good idea"
+msgstr ""
+"Waarschuwing: telnetd is geïnstalleerd -- dit is waarschijnlijk geen goed "
+"idee"
+
+#. Type: note
+#. Description
+#: ../templates.master:106
+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 "
+"least some chance that telnet sessions will not be sending unencrypted login/"
+"password and session information over the network."
+msgstr ""
+"Ik raad u aan om of het telnetd-pakket te verwijderen (indien u geen "
+"telnettoegang hoeft aan te bieden), of telnetd-ssl te installeren zodat er "
+"enige kans is dat telnetsessies geen onversleutelde gebruikersnaam/"
+"wachtwoord en sessie informatie over het netwerk versturen."
+
+#. Type: note
+#. Description
+#: ../templates.master:114
+msgid "Warning: you must create a new host key"
+msgstr "Waarschuwing: u dient een nieuwe computersleutel aan te maken"
+
+#. Type: note
+#. Description
+#: ../templates.master:114
+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 "
+"the old (non-free) SSH installation."
+msgstr ""
+"Er is een oude IDEA-versleutelde /etc/ssh/ssh_host_key aanwezig. OpenSSH kan "
+"dit computersleutelbestand niet aan, en ik kan het ssh-keygen programma van "
+"de oude (niet-vrije) SSH installatie niet vinden."
+
+#. Type: note
+#. Description
+#: ../templates.master:114
+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:124
+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:124
+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:124
+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
+#: ../templates.master:124
+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
+#: ../templates.master:137
+msgid "Do you want to run the sshd server?"
+msgstr "Wilt u de sshd server opstarten?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:137
+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:137
+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:137
+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:149
+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:149
+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:149
+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."
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 6910ceaf7..2464c65f9 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-11-15 15:36+0000\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"
@@ -24,11 +24,13 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Separacja uprawnieñ"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -40,11 +42,13 @@ msgstr ""
 "wy³±czyæ, musisz dodaæ \"UsePrivilegeSeparation no\" do pliku /etc/ssh/"
 "sshd_config."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "W³±czenie separacji uprawnieñ"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -56,6 +60,7 @@ msgstr ""
 "ona ilo¶æ kodu, który jest uruchamiany jako root i co za tym idzie redukuje "
 "efekty luk bezpieczeñstwa w sshd."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -68,14 +73,15 @@ msgstr ""
 "zawiedzie. Nie bêdzie dzia³aæ równie¿ interaktywna autentykacja z klawiatury "
 "(keyboard-interactive authentication)."
 
+#. Type: boolean
 #. 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 ""
 "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 "
@@ -84,11 +90,13 @@ msgstr ""
 "PAMa, które nie bêd± dzia³a³y z t± opcj±, powiniene¶ odpowiedzieæ tutaj "
 "'tak'."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Wygeneruj nowy plik konfiguracyjny"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -104,6 +112,7 @@ msgstr ""
 "dzia³a³ z now± wersj± serwera, ale nie bêdzie zawiera³ ¿adnych dokonanych "
 "przez ciebie w starej wersji zmian."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -120,6 +129,7 @@ msgstr ""
 "wyedytowaæ sshd_config i ustawiæ tê opcjê na 'nie' je¶li siê z t± opini± nie "
 "zgadzasz."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -128,11 +138,13 @@ msgid ""
 msgstr ""
 "Jest bardzo wskazane aby¶ pozwoli³ mi wygenerowaæ nowy plik konfiguracyjny."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Zezwalaj wy³±cznie na wersjê 2 protoko³u SSH"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -146,6 +158,7 @@ msgstr ""
 "dzia³anie na starych maszynach i mo¿e uniemo¿liwiæ po³±czenie starszym "
 "wersjom klientów (dotyczy to np. klienta ssh do³±czanego do \"potato\")."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -156,6 +169,7 @@ msgstr ""
 "bêdziesz móg³ ich u¿ywaæ je¶li zezwolisz na korzystanie wy³±cznie z wersji 2 "
 "protoko³u."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -165,11 +179,13 @@ 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:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "klucze ssh2 w³±czone do plików konfiguracyjnych"
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -181,11 +197,14 @@ msgstr ""
 "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: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) ?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -197,6 +216,7 @@ msgstr ""
 "obecnie kopie sshd. Je¶li robisz ten upgrade via ssh, to by³aby Z³a Rzecz"
 "(tm)."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -206,12 +226,14 @@ msgstr ""
 "Mo¿esz to naprawiæ dodaj±c \"--pidfile /var/run/sshd.pid\" do linijki start-"
 "stop-daemon w sekcji stop tego pliku."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:88
 msgid ""
@@ -221,6 +243,7 @@ msgstr ""
 "Ze wzglêdów bezpieczeñstwa Debianowa wersja ssh ma ForwardX11 i ForwardAgent "
 "ustawione  domy¶lnie na 'off'."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -230,17 +253,20 @@ msgstr ""
 "Dla zaufanych serwerów mo¿esz w³±czyæ te opcje w pliku konfiguracyjnym lub "
 "przy pomocy opcji -X z linii komend."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:99
 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:99
 msgid ""
@@ -251,12 +277,14 @@ msgstr ""
 "prawdopodobnie starasz siê uzyskaæ instaluj±c ssh. Radzi³bym usun±æ ten "
 "pakiet."
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: telnetd jest zainstalowany --- prawdopodobnie nienajlepszy pomys³"
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid ""
@@ -270,11 +298,13 @@ msgstr ""
 "¿e sesje telnet nie bêd± przesy³aæ niezaszyfrowanego loginu/has³a oraz "
 "danych sesji przez sieæ."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Uwaga: musisz utworzyæ nowy klucz hosta"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid ""
@@ -286,16 +316,19 @@ msgstr ""
 "OpenSSH nie umie korzystaæ z tak zaszyfrowanego klucza, a nie mo¿e znale¼æ "
 "polecenia ssh-keygen ze starego SSH (non-free)."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Bêdziesz musia³ wygenerowaæ nowy klucz hosta."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 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:124
 msgid ""
@@ -305,6 +338,7 @@ msgstr ""
 "Masz mo¿liwo¶æ zainstalowania pomocniczego programu ssh-keysign z w³±czonym "
 "bitem SETUID."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -314,6 +348,7 @@ msgstr ""
 "Je¶li uczynisz ssh-keysign SUIDowym, bêdziesz móg³ u¿ywaæ opartej na hostach "
 "autentykacji drugiej wersji protoko³u SSH."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -324,16 +359,20 @@ msgstr ""
 "problemy, mo¿esz zmieniæ swoje zdanie uruchamiaj±c pó¼niej polecenie: dpkg-"
 "reconfigure ssh"
 
+#. Type: boolean
 #. 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 ?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 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:137
 msgid ""
@@ -343,6 +382,7 @@ msgstr ""
 "Normalnie serwer sshd (Secure Shell Server) bêdzie uruchomiony aby umo¿liwiæ "
 "zdalny dostêp przez ssh."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -354,11 +394,13 @@ msgstr ""
 "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:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -368,6 +410,7 @@ msgid ""
 "question will no longer work until the option is removed."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 70961767f..cc1b7f191 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: 2003-09-12 21:03+0100\n"
+"POT-Creation-Date: 2003-11-15 15:36+0000\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"
@@ -23,11 +23,13 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr "Separação de Previlégios"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -39,11 +41,13 @@ msgstr ""
 "decida que deseja desabilitá-la você precisará adicionar a linha "
 "\"UsePrivilegeSeparation no\" ao arquivo /etc/ssh/sshd_config."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Habilitar Separação de Privilégios"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -55,6 +59,7 @@ msgstr ""
 "opção reduz significativamente a quantidade de código que é executada como "
 "root e portanto reduz o impacto de falhas de segurança no sshd."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -67,6 +72,7 @@ msgstr ""
 "(pam_mkhomedir, por exemplo) irão falhar e autenticação interativa com "
 "teclado do PAM não funcionará."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -77,15 +83,17 @@ msgid ""
 msgstr ""
 "Uma vez que você optou por permitir que o debconf gere um arquivo "
 "sshd_config para você, é possível escolher se você deseja ter ou não o "
-"recurso de separação de privilégios habilitado. A menos que você saiba "
-"que utiliza recursos PAM que não funcionarão com esta opção habilitada, "
-"você deverá habilitar esse recurso."
+"recurso de separação de privilégios habilitado. A menos que você saiba que "
+"utiliza recursos PAM que não funcionarão com esta opção habilitada, você "
+"deverá habilitar esse recurso."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Gerar novo arquivo de configuração"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -103,6 +111,7 @@ msgstr ""
 "não irá conter nenhuma personalização que você possa ter feito na versão "
 "anterior."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -121,6 +130,7 @@ msgstr ""
 "editar o arquivo sshd_config e definir esta opção para \"no\" caso você não "
 "concorde com o mantenedor do OpenSSH."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -130,11 +140,13 @@ msgstr ""
 "É fortemente recomendado que você permita que o novo arquivo de configuração "
 "será gerado automaticamente para você."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir somente protocolo SSH versão 2"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -150,6 +162,7 @@ msgstr ""
 "conectar (o cliente ssh fornecido com a versão do Debian 2.2 \"potato\" é "
 "afetada.)"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -160,6 +173,7 @@ msgstr ""
 "portanto você não poderá usá-las caso você somente permita conexões usando o "
 "protocolo 2."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -170,11 +184,13 @@ 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:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "Chaves ssh2 incluídas nos arquivos de configuração"
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -187,11 +203,13 @@ msgstr ""
 "\"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:78
 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:78
 msgid ""
@@ -203,6 +221,7 @@ msgstr ""
 "todas as instâncias sshd sendo executadas. Se você está fazendo esta "
 "atualização através de uma sessão ssh, isto seria uma Coisa Ruim(tm)."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -212,11 +231,13 @@ msgstr ""
 "Você pode corrigir isto adicionando \"--pidfile /var/run/sshd.pid\" na linha "
 "start-stop-daemon na seção stop deste arquivo."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:88
 msgid ""
@@ -226,6 +247,7 @@ msgstr ""
 "Por razôes de segurança, a versão Debian do ssh tem as opções ForwardX11 e "
 "ForwardAgent definidas como ``off'' por padrão."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -235,17 +257,20 @@ msgstr ""
 "Você pode habilitar isso para servidores que você confia, ou em um dos "
 "arquivos de configuração, ou com a opção de linha de comando -X."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:99
 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:99
 msgid ""
@@ -256,11 +281,13 @@ msgstr ""
 "provavelmente querendo obter instalando o ssh. Eu recomendaria a você "
 "remover este pacote."
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 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:106
 msgid ""
@@ -274,11 +301,13 @@ msgstr ""
 "menos uma chance das sessões telnet não enviarem login/senha não encriptados "
 "e informações de sessão através da rede."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: você deve criar uma nova host key"
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid ""
@@ -290,16 +319,19 @@ msgstr ""
 "OpenSSH não pode gerenciar este arquivo host key e eu não consigo encontrar "
 "o utilitário ssh-keygen da antiga (non-free) instalação SSH."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Você precisará gerar uma nova host key."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 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:124
 msgid ""
@@ -309,6 +341,7 @@ msgstr ""
 "Existe a opção de instalar o cliente auxiliar ssh-keysign com o bit SUID "
 "definido."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -318,6 +351,7 @@ 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
 #: ../templates.master:124
 msgid ""
@@ -328,16 +362,19 @@ msgstr ""
 "Caso isso cause problemas e você mude de idéia posteriormente execute o "
 "comando : dpkg-reconfigure ssh"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid "Do you want to run the sshd server?"
 msgstr "Você deseja executar o servidor sshd ?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 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:137
 msgid ""
@@ -347,6 +384,7 @@ msgstr ""
 "Normalmente o sshd Secure Shell Server será executado para permitir logins "
 "remotos via ssh."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -358,11 +396,13 @@ msgstr ""
 "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:149
 msgid "Environment options on keys have been deprecated"
 msgstr "Opções ed ambiente sobre chaves estão obsoletas"
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -377,6 +417,7 @@ msgstr ""
 "as chaves em questão não irão mais funcionar até que esta opção seja "
 "removida."
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 3d5f8ff09..fa8e190bd 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-09-12 21:03+0100\n"
+"POT-Creation-Date: 2003-11-15 15:36+0000\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"
@@ -24,11 +24,13 @@ msgstr ""
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr "òÁÚÄÅÌÅÎÉÅ ÐÒÉ×ÉÌÅÇÉÊ"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -40,11 +42,13 @@ msgstr ""
 "ÏÔËÌÀÞÉÔØ, ÔÏ ÎÅÏÂÈÏÄÉÍÏ ÄÏÂÁ×ÉÔØ × ÆÁÊÌ /etc/ssh/sshd_config ÓÔÒÏËÕ "
 "\"UsePrivilegeSeparation no\"."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "òÁÚÒÅÛÉÔØ ÒÁÚÄÅÌÅÎÉÅ ÐÒÉ×ÉÌÅÇÉÊ"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -56,6 +60,7 @@ msgstr ""
 "üÔÏ ÚÎÁÞÉÔÅÌØÎÏ ÓÏËÒÁÝÁÅÔ ÒÁÚÍÅÒ ËÏÄÁ, ÒÁÂÏÔÁÀÝÅÇÏ Ó ÐÒÁ×ÁÍÉ root, É × ÃÅÌÏÍ "
 "ÓÎÉÖÁÅÔ ÐÏÔÅÎÃÉÁÌØÎÕÀ ÕÑÚ×ÉÍÏÓÔØ sshd."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -68,6 +73,7 @@ msgstr ""
 "pam_mkhomedir), É PAM-ÁÕÔÅÎÔÉÆÉËÁÃÉÑ × ÉÎÔÅÒÁËÔÉ×ÎÏÍ ÒÅÖÉÍÅ Ó ËÌÁ×ÉÁÔÕÒÙ "
 "ÒÁÂÏÔÁÔØ ÎÅ ÂÕÄÅÔ."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -81,11 +87,13 @@ msgstr ""
 "åÓÌÉ ÷Ù ÎÅ ÚÎÁÅÔÅ, ÎÕÖÎÏ ÌÉ ÷ÁÍ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÕÎËÃÉÉ PAM, ËÏÔÏÒÙÅ ÎÅ "
 "ÒÁÂÏÔÁÀÔ Ó ÜÔÏÊ ÏÐÃÉÅÊ, ÔÏ ÌÕÞÛÅ ÒÁÚÒÅÛÉÔØ ÅÅ."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "óÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÙÊ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -101,6 +109,7 @@ msgstr ""
 "config), ËÏÔÏÒÙÊ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ Ó ÎÏ×ÏÊ ×ÅÒÓÉÅÊ ÓÅÒ×ÅÒÁ, ÎÏ ÎÅ ÂÕÄÅÔ "
 "ÓÏÄÅÒÖÁÔØ ÎÁÓÔÒÏÅË, ËÏÔÏÒÙÅ ÷Ù ÓÄÅÌÁÌÉ × ÓÔÁÒÏÊ ×ÅÒÓÉÉ."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -116,6 +125,7 @@ msgstr ""
 "ÓÏÐÒÏ×ÏÖÄÁÀÝÅÇÏ ÜÔÏÇÏ ÐÁËÅÔÁ - ÜÔÏ ÒÁÚÕÍÎÏ, ÎÏ ÷Ù ×ÓÅÇÄÁ ÍÏÖÅÔÅ ÕÓÔÁÎÏ×ÉÔØ "
 "ÚÎÁÞÅÎÉÅ ÜÔÏÇÏ ÐÁÒÁÍÅÔÒÁ × ÆÁÊÌÅ sshd_config ÔÁË, ËÁË ÷ÁÍ ËÁÖÅÔÓÑ ÐÒÁ×ÉÌØÎÙÍ."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -125,11 +135,13 @@ msgstr ""
 "îÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÒÁÚÒÅÛÉÔØ ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÄÌÑ ÷ÁÓ ÎÏ×ÙÊ ÆÁÊÌ "
 "ÎÁÓÔÒÏÅË."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "òÁÚÒÅÛÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÔÏÌØËÏ SSH-ÐÒÏÔÏËÏÌÁ ×ÅÒÓÉÉ 2."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -144,6 +156,7 @@ msgstr ""
 "ÎÅ×ÏÚÍÏÖÎÙÍ ÐÏÄËÌÀÞÅÎÉÅ Ó ÐÏÍÏÝØÀ ÓÔÁÒÙÈ ËÌÉÅÎÔÓËÉÈ ÐÒÏÇÒÁÍÍ (× ÞÁÓÔÎÏÓÔÉ, "
 "ÜÔÏ ÏÔÎÏÓÉÔÓÑ Ë ËÌÉÅÎÔÕ ssh, ÐÏÓÔÁ×ÌÑÅÍÏÇÏ Ó \"potato\"."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -154,6 +167,7 @@ msgstr ""
 "ÆÏÒÍÁÔ, É ÐÏÜÔÏÍÕ ÷Ù ÎÅ ÓÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÈ, ÅÓÌÉ ÒÁÚÒÅÛÉÔÅ ÔÏÌØËÏ "
 "ÓÏÅÄÉÎÅÎÉÑ ÐÏ ÐÒÏÔÏËÏÌÕ ×ÅÒÓÉÉ 2."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -163,11 +177,13 @@ msgstr ""
 "åÓÌÉ ÐÏÚÖÅ ÷Ù ÉÚÍÅÎÉÔÅ Ó×ÏÅ ÍÎÅÎÉÅ, ÔÏ × ÆÁÊÌÅ README.Debian ÓÏÄÅÒÖÁÔÓÑ "
 "ÉÎÓÔÒÕËÃÉÉ Ï ÔÏÍ, ÞÔÏ ÎÕÖÎÏ ÓÄÅÌÁÔØ × ÆÁÊÌÅ sshd_config."
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "ëÌÀÞÉ ssh2 ÄÏÂÁ×ÌÅÎÙ × ÆÁÊÌÙ ÎÁÓÔÒÏÅË"
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -180,11 +196,13 @@ msgstr ""
 "ÎÕÖÎÙ. ðÒÏÇÒÁÍÍÁ ÐÏ-ÐÒÅÖÎÅÍÕ ÂÕÄÅÔ ÉÈ ÓÞÉÔÙ×ÁÔØ ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ÏÂÒÁÔÎÏÊ "
 "ÓÏ×ÍÅÓÔÉÍÏÓÔÉ."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "÷Ù ÈÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ (ÒÉÓËÕÑ ÐÏÔÅÒÑÔØ ÁËÔÉ×ÎÙÅ ssh-ÓÏÅÄÉÎÅÎÉÑ)?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -196,6 +214,7 @@ msgstr ""
 "ÚÁÐÕÝÅÎÎÙÅ  ÐÒÏÃÅÓÓÙ  ssh.  åÓÌÉ ×Ù ÏÓÕÝÅÓÔ×ÌÑÅÔÅ ÜÔÏ ÏÂÎÏ×ÌÅÎÉÅ ÞÅÒÅÚ ssh "
 "ÓÅÓÓÉÀ, ÔÏ ÜÔÏ ðÌÏÈÁÑ ÷ÅÝØ (tm)."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -205,11 +224,13 @@ msgstr ""
 "üÔÏ ÍÏÖÎÏ ÉÓÐÒÁ×ÉÔØ ÄÏÂÁ×ÌÅÎÉÅÍ \"--pidfile /var/run/sshd.pid\" × ÓÔÒÏËÅ "
 "start-stop-daemon × ÒÁÚÄÅÌÅ stop ÜÔÏÇÏ ÆÁÊÌÁ."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "ðòéíåþáîéå: æÏÒ×ÁÒÄÉÎÇ X11 É Authorization ÚÁÐÒÅÝÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -219,6 +240,7 @@ msgstr ""
 "ðÏ ÐÒÉÞÉÎÁÍ ÂÅÚÏÐÁÓÎÏÓÔÉ, × ×ÅÒÓÉÉ ÄÌÑ Debian ssh ÉÍÅÅÔ ForwardX11 É "
 "ForwardAgent ÕÓÔÁÎÏ×ÌÅÎÎÙÍÉ × ``off'' ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -228,17 +250,20 @@ msgstr ""
 "÷Ù ÍÏÖÅÔÅ ÒÁÚÒÅÛÉÔØ ÉÈ ÄÌÑ ÓÅÒ×ÅÒÏ×, ËÏÔÏÒÙÍ ÄÏ×ÅÒÑÅÔÅ ÌÉÂÏ × ÏÄÎÏÍ ÉÚ "
 "ÎÁÓÔÒÏÅÞÎÙÈ ÆÁÊÌÏ×, ÉÌÉ ÐÁÒÁÍÅÔÒÏÍ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ -X."
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 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:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÏ×ÌÅÎ rsh-server --- ÐÏÖÁÌÕÊ, ÜÔÏ ÎÅ ÏÞÅÎØ ÈÏÒÏÛÏ"
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid ""
@@ -248,11 +273,13 @@ msgstr ""
 "õÓÔÁÎÏ×ÌÅÎÎÙÊ rsh-ÓÅÒ×ÅÒ ÓÎÉÖÁÅÔ ÂÅÚÏÐÁÓÎÏÓÔØ, ËÏÔÏÒÕÀ ÷Ù ×ÅÒÏÑÔÎÏ ÈÏÔÉÔÅ "
 "ÐÏ×ÙÓÉÔØ ÕÓÔÁÎÁ×ÌÉ×ÁÑ ssh. òÅËÏÍÅÎÄÕÅÔÓÑ ÕÄÁÌÉÔØ ÜÔÏÔ ÐÁËÅÔ."
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÏ×ÌÅÎ telnetd --- ÐÏÖÁÌÕÊ, ÜÔÏ ÎÅ ÏÞÅÎØ ÈÏÒÏÛÏ"
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid ""
@@ -266,11 +293,13 @@ msgstr ""
 "ÐÅÒÅÄÁ×ÁÔØ ÐÏ ÓÅÔÉ ÎÅÚÁÛÉÆÒÏ×ÁÎÎÙÅ ÉÍÅÎÁ É ÐÁÒÏÌÉ ÐÏÌØÚÏ×ÁÔÅÌÅÊ É ÐÒÏÞÕÀ "
 "ÉÎÆÏÒÍÁÃÉÀ × telnet-ÓÅÓÓÉÑÈ."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÷Ù ÄÏÌÖÎÙ ÓÏÚÄÁÔØ ÎÏ×ÙÊ ÈÏÓÔÏ×ÙÊ ËÌÀÞ."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid ""
@@ -282,16 +311,19 @@ msgstr ""
 "ÍÏÖÅÔ ÒÁÂÏÔÁÔØ Ó ÜÔÉÍ ÈÏÓÔÏ×ÙÍ ËÌÀÞÏÍ, É Ñ ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÕÔÉÌÉÔÕ ssh-keygen "
 "ÏÔ ÓÔÁÒÏÊ (ÎÅÓ×ÏÂÏÄÎÏÊ) ÉÎÓÔÁÌÌÑÃÉÉ SSH."
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "÷ÁÍ ÎÁÄÏ ÂÕÄÅÔ ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÙÊ ËÌÀÞ ÈÏÓÔÁ."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 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:124
 msgid ""
@@ -299,6 +331,7 @@ msgid ""
 "set."
 msgstr "÷Ù ÉÍÅÅÔÅ ×ÏÚÍÏÖÎÏÓÔØ ÕÓÔÁÎÏ×ÉÔØ ÂÉÔ SUID ÄÌÑ ÕÔÉÌÉÔÙ ssh-keysign."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -308,6 +341,7 @@ msgstr ""
 "åÓÌÉ ×Ù ÕÓÔÁÎÏ×ÉÔÅ ÂÉÔ SUID ÄÌÑ ssh, ÔÏ ×Ù ÓÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÈÏÓÔÏ×ÕÀ "
 "ÁÕÔÅÎÔÉÆÉËÁÃÉÀ ÄÌÑ SSH-ÐÒÏÔÏËÏÌÁ ×ÅÒÓÉÉ 2."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -317,16 +351,19 @@ msgstr ""
 "åÓÌÉ ÷Ù ÎÅ ÚÎÁÅÔÅ, ÞÔÏ ×ÙÂÒÁÔØ, ÔÏ ÒÅËÏÍÅÎÄÕÀ ÕÓÔÁÎÏ×ÉÔØ SUID ÄÌÑ ssh. ÷ "
 "ÄÁÌØÎÅÊÛÅÍ, ÷Ù ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ Ó×ÏÊ ×ÙÂÏÒ ËÏÍÁÎÄÏÊ: dpkg-reconfigure ssh"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid "Do you want to run the sshd server?"
 msgstr "èÏÔÉÔÅ ÚÁÐÕÓÔÉÔØ ÓÅÒ×ÅÒ sshd?"
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ É ssh-ËÌÉÅÎÔ, É ssh-ÓÅÒ×ÅÒ."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -336,6 +373,7 @@ msgstr ""
 "ïÂÙÞÎÏ sshd Secure Shell Server ÚÁÐÕÓËÁÅÔÓÑ ÄÌÑ ÕÄÁÌÅÎÎÏÇÏ ×ÈÏÄÁ × ÓÉÓÔÅÍÕ "
 "ÞÅÒÅÚ ssh."
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -347,11 +385,13 @@ msgstr ""
 "ÓÏÅÄÉÎÅÎÉÊ Ó ÜÔÏÊ ÍÁÛÉÎÙ, É ×Ù ÎÅ ÈÏÔÉÔÅ ×ÈÏÄÉÔØ × ÅÅ ÓÉÓÔÅÍÕ ÞÅÒÅÚ ssh, ÔÏ "
 "ÓÅÊÞÁÓ ÷Ù ÍÏÖÅÔÅ ÚÁÐÒÅÔÉÔØ sshd."
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr "ïÐÃÉÉ ÏËÒÕÖÅÎÉÑ ÄÌÑ ËÌÀÞÅÊ ÂÙÌÉ ÚÁÐÒÅÝÅÎÙ"
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -365,6 +405,7 @@ msgstr ""
 "ÏÐÃÉÀ × ÆÁÊÌÅ authorized_keys, ÔÏ ÂÕÄØÔÅ ×ÎÉÍÁÔÅÌØÎÙ, ÄÁÎÎÙÅ ËÌÀÞÉ ÂÏÌØÛÅ ÎÅ "
 "ÂÕÄÕÔ ÒÁÂÏÔÁÔØ, ÐÏËÁ ÏÐÃÉÑ ÎÅ ÕÄÁÌÅÎÁ."
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 42e6a9522..ef7c409f7 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-11-15 15:36+0000\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"
@@ -24,11 +24,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid "Privilege separation"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:3
 msgid ""
@@ -37,11 +39,13 @@ msgid ""
 "sshd_config."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -50,6 +54,7 @@ msgid ""
 "reduces the impact of security holes in sshd."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:19
 msgid ""
@@ -58,20 +63,23 @@ msgid ""
 "fail, and PAM keyboard-interactive authentication won't work."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../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 ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -82,6 +90,7 @@ msgid ""
 "any customisations you made with the old version."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -92,6 +101,7 @@ msgid ""
 "edit sshd_config and set it to no if you wish."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:36
 msgid ""
@@ -99,11 +109,13 @@ msgid ""
 "for you."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -113,6 +125,7 @@ msgid ""
 "connecting (the ssh client shipped with \"potato\" is affected)."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -120,6 +133,7 @@ msgid ""
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:55
 msgid ""
@@ -127,11 +141,13 @@ msgid ""
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:69
 msgid ""
@@ -140,11 +156,13 @@ msgid ""
 "needed. They will still be read in order to maintain backwards compatibility"
 msgstr ""
 
+#. Type: boolean
 #. 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 ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -153,6 +171,7 @@ msgid ""
 "session, that would be a Bad Thing(tm)."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:78
 msgid ""
@@ -160,11 +179,13 @@ msgid ""
 "daemon line in the stop section of the file."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -172,6 +193,7 @@ msgid ""
 "ForwardAgent set to ``off'' by default."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid ""
@@ -179,16 +201,19 @@ msgid ""
 "files, or with the -X command line option."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:99
 msgid ""
@@ -196,11 +221,13 @@ msgid ""
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:106
 msgid ""
@@ -210,11 +237,13 @@ msgid ""
 "password and session information over the network."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid ""
@@ -223,16 +252,19 @@ msgid ""
 "the old (non-free) SSH installation."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -240,6 +272,7 @@ msgid ""
 "set."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -247,6 +280,7 @@ msgid ""
 "based authentication."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:124
 msgid ""
@@ -254,16 +288,19 @@ msgid ""
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
-msgid "Do you want to run the sshd server ?"
+msgid "Do you want to run the sshd server?"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -271,6 +308,7 @@ msgid ""
 "ssh."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../templates.master:137
 msgid ""
@@ -279,11 +317,13 @@ msgid ""
 "can disable sshd here."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""
@@ -293,6 +333,7 @@ msgid ""
 "question will no longer work until the option is removed."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../templates.master:149
 msgid ""