10 files changed, 413 insertions, 201 deletions

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 17949446e..eb8be9f83 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: strongswan\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2006-09-24 20:49+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -266,8 +266,12 @@ msgstr "Jméno souboru s certifikátem X509 ve formátu PEM:"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:8001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full location of the file containing your X509  "
+#| "certificate in PEM format."
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Zadejte prosím absolutní cestu k souboru obsahujícímu váš certifikát X509 ve "
@@ -300,8 +304,14 @@ msgstr "Délka vytvořeného RSA klíče (v bitech):"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -339,10 +349,17 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Jestliže nechcete vytvořit certifikát podepsaný sám sebou, vytvoří tento "
 "instalátor jen soukromý RSA klíč a požadavek na certifikát. Vy potom musíte "
diff --git a/debian/po/de.po b/debian/po/de.po
index 524696fb9..0756c7724 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: strongswan 2.8.3-1\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2006-08-25 17:56+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2007-06-30 10:36+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -52,9 +52,9 @@ msgstr ""
 "Falls Sie Ihren /usr-Baum nicht �ber NFS eingeh�ngt haben (entweder weil Sie "
 "nur andere, weniger lebenswichtige B�ume �ber NFS einh�ngen, oder falls Sie "
 "NFS �berhaupt nicht verwenden) und keine PCMCIA-Netzwerkkarte benutzen, ist "
-"es am besten, strongSwan so fr�h wie m�glich zu starten und damit durch IPSec "
-"gesicherte NFS-Einh�ngungen zu erlauben. In diesem Fall (oder falls Sie "
-"dieses Problem nicht verstehen oder es Ihnen egal ist), antworten Sie "
+"es am besten, strongSwan so fr�h wie m�glich zu starten und damit durch "
+"IPSec gesicherte NFS-Einh�ngungen zu erlauben. In diesem Fall (oder falls "
+"Sie dieses Problem nicht verstehen oder es Ihnen egal ist), antworten Sie "
 "�fr�hestm�glich� (Standardwert) auf diese Frage."
 
 #. Type: select
@@ -70,8 +70,8 @@ msgstr ""
 "Falls Sie Ihren /usr-Baum �ber NFS eingeh�ngt haben und keine PCMCIA-"
 "Netzwerkkarte benutzen, m�ssen Sie strongSwan nach NFS starten, so dass alle "
 "ben�tigten Dateien verf�gbar sind. In diesem Fall antworten Sie �nach NFS� "
-"auf diese Frage. Bitte beachten Sie, dass NFS-Einh�ngungen von /usr in diesem "
-"Fall nicht �ber IPSec gesichert werden k�nnen."
+"auf diese Frage. Bitte beachten Sie, dass NFS-Einh�ngungen von /usr in "
+"diesem Fall nicht �ber IPSec gesichert werden k�nnen."
 
 #. Type: select
 #. Description
@@ -85,8 +85,8 @@ msgstr ""
 "Falls Sie eine PCMCIA-Netzwerkkarte f�r Ihre IPSec-Verbindungen benutzen, "
 "dann m�ssen Sie nur ausw�hlen, dass er nach den PCMCIA-Diensten startet. "
 "Antworten Sie in diesem Fall �nach PCMCIA�. Dies ist auch die richtige "
-"Antwort, falls Sie Schl�ssel von einem lokal laufenden DNS-Server mit "
-"DNSSec-Unterst�tzung abholen wollen."
+"Antwort, falls Sie Schl�ssel von einem lokal laufenden DNS-Server mit DNSSec-"
+"Unterst�tzung abholen wollen."
 
 #. Type: boolean
 #. Description
@@ -111,6 +111,40 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:3001
+#, fuzzy
+#| msgid "Do you wish to restart strongSwan?"
+msgid "Do you wish to support IKEv1?"
+msgstr "M�chten Sie strongSwan neustarten?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:3001
+msgid ""
+"strongSwan supports both versions of the Internet Key Exchange protocol, "
+"IKEv1 and IKEv2. Do you want to start the \"pluto\" daemon for IKEv1 support "
+"when strongSwan is started?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:4001
+#, fuzzy
+#| msgid "Do you wish to restart strongSwan?"
+msgid "Do you wish to support IKEv2?"
+msgstr "M�chten Sie strongSwan neustarten?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:4001
+msgid ""
+"strongSwan supports both versions of the Internet Key Exchange protocol, "
+"IKEv1 and IKEv2. Do you want to start the \"charon\" daemon for IKEv2 "
+"support when strongSwan is started?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:5001
 msgid "Do you want to create a RSA public/private keypair for this host?"
 msgstr ""
 "M�chten Sie ein �ffentlich/privates RSA-Schl�sselpaar f�r diesen Rechner "
@@ -118,7 +152,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:3001
+#: ../strongswan.templates.master:5001
 msgid ""
 "This installer can automatically create a RSA public/private keypair for "
 "this host. This keypair can be used to authenticate IPSec connections to "
@@ -130,16 +164,16 @@ msgid ""
 msgstr ""
 "Das Installationsprogramm kann automatisch ein �ffentliches/privates RSA-"
 "Schl�sselpaar f�r diesen Rechner erstellen. Dieses Schl�sselpaar kann zur "
-"Authentifizierung von IPSec-Verbindungen anderer Rechner verwendet werden und "
-"ist die bevorzugte Art, sichere IPSec-Verbindungen aufzubauen. Die andere "
-"M�glichkeit besteht darin, vorab-verteilte Geheimnisse (Passw�rter, die auf "
-"beiden Seiten des Tunnels identisch sind) zur Authentifizierung einer "
-"Verbindung zu verwenden, aber f�r eine gr��ere Anzahl an Verbindungen ist die "
-"RSA-Authentifizierung einfacher zu administrieren und sicherer."
+"Authentifizierung von IPSec-Verbindungen anderer Rechner verwendet werden "
+"und ist die bevorzugte Art, sichere IPSec-Verbindungen aufzubauen. Die "
+"andere M�glichkeit besteht darin, vorab-verteilte Geheimnisse (Passw�rter, "
+"die auf beiden Seiten des Tunnels identisch sind) zur Authentifizierung "
+"einer Verbindung zu verwenden, aber f�r eine gr��ere Anzahl an Verbindungen "
+"ist die RSA-Authentifizierung einfacher zu administrieren und sicherer."
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:3001
+#: ../strongswan.templates.master:5001
 msgid ""
 "If you do not want to create a new public/private keypair, you can choose to "
 "use an existing one."
@@ -149,32 +183,32 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan.templates.master:4001
+#: ../strongswan.templates.master:6001
 msgid "x509, plain"
 msgstr "x509, einfach"
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid "The type of RSA keypair to create:"
 msgstr "Die Art des RSA-Schl�sselpaars, das erstellt werden soll:"
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid ""
 "It is possible to create a plain RSA public/private keypair for use with "
 "strongSwan or to create a X509 certificate file which contains the RSA "
 "public key and additionally stores the corresponding private key."
 msgstr ""
-"Es besteht die M�glichkeit, ein einfaches �ffentliches/privates Schl�sselpaar "
-"f�r den Einsatz mit strongSwan oder eine X509-Zertifikatsdatei zu erstellen, "
-"die den �ffentlichen Schl�ssel und zus�tzlich den zugeh�rigen privaten "
-"Schl�ssel enth�lt."
+"Es besteht die M�glichkeit, ein einfaches �ffentliches/privates "
+"Schl�sselpaar f�r den Einsatz mit strongSwan oder eine X509-Zertifikatsdatei "
+"zu erstellen, die den �ffentlichen Schl�ssel und zus�tzlich den zugeh�rigen "
+"privaten Schl�ssel enth�lt."
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid ""
 "If you only want to build up IPSec connections to hosts also running "
 "strongSwan, it might be a bit easier using plain RSA keypairs. But if you "
@@ -184,16 +218,17 @@ msgid ""
 "without X509 certificate support."
 msgstr ""
 "Falls Sie nur IPSec-Verbindungen zu Rechnern aufbauen wollen, auf denen auch "
-"strongSwan l�uft, k�nnte es etwas einfacher sein, einfache RSA-Schl�sselpaare "
-"zu verwenden. Falls Sie aber mit anderen IPSec-Implementierungen Verbindungen "
-"aufnehmen wollen, ben�tigen Sie ein X509-Zertifikat. Es besteht auch die "
-"M�glichkeit, hier ein X509-Zertifikat zu erstellen und den �ffentlichen RSA-"
-"Schl�ssel im einfachen Format zu extrahieren, falls die andere Seite "
-"strongSwan ohne X509-Zertifikatsunterst�tzung betreibt."
+"strongSwan l�uft, k�nnte es etwas einfacher sein, einfache RSA-"
+"Schl�sselpaare zu verwenden. Falls Sie aber mit anderen IPSec-"
+"Implementierungen Verbindungen aufnehmen wollen, ben�tigen Sie ein X509-"
+"Zertifikat. Es besteht auch die M�glichkeit, hier ein X509-Zertifikat zu "
+"erstellen und den �ffentlichen RSA-Schl�ssel im einfachen Format zu "
+"extrahieren, falls die andere Seite strongSwan ohne X509-"
+"Zertifikatsunterst�tzung betreibt."
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid ""
 "Therefore a X509 certificate is recommended since it is more flexible and "
 "this installer should be able to hide the complex creation of the X509 "
@@ -205,13 +240,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:5001
+#: ../strongswan.templates.master:7001
 msgid "Do you have an existing X509 certificate file for strongSwan?"
 msgstr "Verf�gen Sie �ber ein existierendes X509-Zertifikat f�r strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:5001
+#: ../strongswan.templates.master:7001
 msgid ""
 "This installer can automatically extract the needed information from an "
 "existing X509 certificate with a matching RSA private key. Both parts can be "
@@ -228,15 +263,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:6001
+#: ../strongswan.templates.master:8001
 msgid "File name of your X509 certificate in PEM format:"
 msgstr "Dateiname Ihres X509-Zertifikates im PEM-Format:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:6001
+#: ../strongswan.templates.master:8001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full location of the file containing your X509  "
+#| "certificate in PEM format."
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Bitte geben Sie den kompletten Ort der Datei an, die Ihr X509-Zertifikat im "
@@ -244,13 +283,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:7001
+#: ../strongswan.templates.master:9001
 msgid "File name of your X509 private key in PEM format:"
 msgstr "Dateiname Ihres privaten X509-Schl�ssels im PEM-Format:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:7001
+#: ../strongswan.templates.master:9001
 msgid ""
 "Please enter the full location of the file containing the private RSA key "
 "matching your X509 certificate in PEM format. This can be the same file that "
@@ -262,15 +301,21 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:8001
+#: ../strongswan.templates.master:10001
 msgid "The length of the created RSA key (in bits):"
 msgstr "Die L�nge des erstellten RSA-Schl�ssels (in Bits):"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:8001
+#: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -282,13 +327,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:9001
+#: ../strongswan.templates.master:11001
 msgid "Do you want to create a self-signed X509 certificate?"
 msgstr "M�chten Sie ein selbst-signiertes X509-Zertifikat erstellen?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:9001
+#: ../strongswan.templates.master:11001
 msgid ""
 "This installer can only create self-signed X509 certificates automatically, "
 "because otherwise a certificate authority is needed to sign the certificate "
@@ -299,37 +344,44 @@ msgid ""
 "certificates signed by a single certificate authority to create a trust path."
 msgstr ""
 "Das Installationsprogramm kann nur selbst-signierte X509-Zertifikate "
-"automatisch erstellen, da andernfalls eine Zertifizierungsstelle zur Signatur "
-"der Zertifikatsanfrage ben�tigt wird. Falls Sie ein selbst-signiertes "
-"Zertifikat erstellen m�chten, k�nnen Sie es sofort zur Verbindung mit anderen "
-"IPSec-Rechnern verwenden, die X509-Zertifikate zur Authentifizierung von "
-"IPSec-Verbindungen verwenden. Falls Sie allerdings die neuen PKI-"
-"Funktionalit�ten von strongSwan >= 1.91 verwenden m�chten, m�ssen alle X509-"
-"Zertifikate von einer einzigen Zertifizierungsstelle signiert sein, um einen "
-"vertrauensvollen Pfad zu etablieren."
+"automatisch erstellen, da andernfalls eine Zertifizierungsstelle zur "
+"Signatur der Zertifikatsanfrage ben�tigt wird. Falls Sie ein selbst-"
+"signiertes Zertifikat erstellen m�chten, k�nnen Sie es sofort zur Verbindung "
+"mit anderen IPSec-Rechnern verwenden, die X509-Zertifikate zur "
+"Authentifizierung von IPSec-Verbindungen verwenden. Falls Sie allerdings die "
+"neuen PKI-Funktionalit�ten von strongSwan >= 1.91 verwenden m�chten, m�ssen "
+"alle X509-Zertifikate von einer einzigen Zertifizierungsstelle signiert "
+"sein, um einen vertrauensvollen Pfad zu etablieren."
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:9001
+#: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Falls Sie kein selbst-signiertes Zertifikat erstellen m�chten, wird dieses "
 "Installationsprogramm nur einen privaten RSA-Schl�ssel und die "
-"Zertifikatsanfrage erstellen und Sie m�ssen die Zertifikatsanfrage selbst mit "
-"Ihrer Zertifizierungsstelle signieren."
+"Zertifikatsanfrage erstellen und Sie m�ssen die Zertifikatsanfrage selbst "
+"mit Ihrer Zertifizierungsstelle signieren."
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid "Country code for the X509 certificate request:"
 msgstr "L�ndercode f�r die X509-Zertifizierungsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid ""
 "Please enter the 2 letter country code for your country. This code will be "
 "placed in the certificate request."
@@ -339,31 +391,31 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid ""
 "You really need to enter a valid country code here, because openssl will "
 "refuse to generate certificates without one. An empty field is allowed for "
 "any other field of the X.509 certificate, but not for this one."
 msgstr ""
-"Sie m�ssen wirklich einen g�ltigen L�ndercode hier eingeben, da OpenSSL "
-"es ablehnen wird, Zertifikate ohne diese zu erstellen. Jedes andere Feld im "
+"Sie m�ssen wirklich einen g�ltigen L�ndercode hier eingeben, da OpenSSL es "
+"ablehnen wird, Zertifikate ohne diese zu erstellen. Jedes andere Feld im "
 "X509-Zertifikat darf leer bleiben; dieses aber nicht."
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid "Example: AT"
 msgstr "Beispiel: AT"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:11001
+#: ../strongswan.templates.master:13001
 msgid "State or province name for the X509 certificate request:"
 msgstr "Name des Landes oder der Provinz f�r diese X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:11001
+#: ../strongswan.templates.master:13001
 msgid ""
 "Please enter the full name of the state or province you live in. This name "
 "will be placed in the certificate request."
@@ -373,19 +425,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:11001
+#: ../strongswan.templates.master:13001
 msgid "Example: Upper Austria"
 msgstr "Beispiel: Ober�sterreich"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:12001
+#: ../strongswan.templates.master:14001
 msgid "Locality name for the X509 certificate request:"
 msgstr "�rtlichkeitsangabe f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:12001
+#: ../strongswan.templates.master:14001
 msgid ""
 "Please enter the locality (e.g. city) where you live. This name will be "
 "placed in the certificate request."
@@ -395,19 +447,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:12001
+#: ../strongswan.templates.master:14001
 msgid "Example: Vienna"
 msgstr "Beispiel: Wien"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:13001
+#: ../strongswan.templates.master:15001
 msgid "Organization name for the X509 certificate request:"
 msgstr "Organisationsname f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:13001
+#: ../strongswan.templates.master:15001
 msgid ""
 "Please enter the organization (e.g. company) that the X509 certificate "
 "should be created for. This name will be placed in the certificate request."
@@ -418,67 +470,67 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:13001
+#: ../strongswan.templates.master:15001
 msgid "Example: Debian"
 msgstr "Beispiel: Debian"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:14001
+#: ../strongswan.templates.master:16001
 msgid "Organizational unit for the X509 certificate request:"
 msgstr "Organisationseinheit f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:14001
+#: ../strongswan.templates.master:16001
 msgid ""
 "Please enter the organizational unit (e.g. section) that the X509 "
 "certificate should be created for. This name will be placed in the "
 "certificate request."
 msgstr ""
-"Bitte geben Sie die Organisationseinheit (z.B. Bereich) ein, f�r die das X509-"
-"Zertifikat erstellt werden soll. Dieser Name wird in der Zertifikatsanfrage "
-"verwandt."
+"Bitte geben Sie die Organisationseinheit (z.B. Bereich) ein, f�r die das "
+"X509-Zertifikat erstellt werden soll. Dieser Name wird in der "
+"Zertifikatsanfrage verwandt."
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:14001
+#: ../strongswan.templates.master:16001
 msgid "Example: security group"
 msgstr "Beispiel: Sicherheitsgruppe"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:15001
+#: ../strongswan.templates.master:17001
 msgid "Common name for the X509 certificate request:"
 msgstr "Allgemeiner Name f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:15001
+#: ../strongswan.templates.master:17001
 msgid ""
 "Please enter the common name (e.g. the host name of this machine) for which "
 "the X509 certificate should be created for. This name will be placed in the "
 "certificate request."
 msgstr ""
-"Bitte geben Sie den allgemeinen Namen (z.B. den Rechnernamen dieser Maschine) "
-"ein, f�r den das X509-Zertifikat erstellt werden soll. Dieser Name wird in "
-"der Zertifikatsanfrage verwandt."
+"Bitte geben Sie den allgemeinen Namen (z.B. den Rechnernamen dieser "
+"Maschine) ein, f�r den das X509-Zertifikat erstellt werden soll. Dieser Name "
+"wird in der Zertifikatsanfrage verwandt."
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:15001
+#: ../strongswan.templates.master:17001
 msgid "Example: gateway.debian.org"
 msgstr "Beispiel: gateway.debian.org"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:16001
+#: ../strongswan.templates.master:18001
 msgid "Email address for the X509 certificate request:"
 msgstr "E-Mail-Adresse f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:16001
+#: ../strongswan.templates.master:18001
 msgid ""
 "Please enter the email address of the person or organization who is "
 "responsible for the X509 certificate, This address will be placed in the "
@@ -490,13 +542,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:17001
+#: ../strongswan.templates.master:19001
 msgid "Do you wish to enable opportunistic encryption in strongSwan?"
 msgstr "M�chten Sie opportunistische Verschl�sselung in strongSwan aktivieren?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:17001
+#: ../strongswan.templates.master:19001
 msgid ""
 "strongSwan comes with support for opportunistic encryption (OE), which "
 "stores IPSec authentication information (i.e. RSA public keys) in "
@@ -517,7 +569,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:17001
+#: ../strongswan.templates.master:19001
 msgid ""
 "Please choose whether you want to enable support for OE. If unsure, do not "
 "enable it."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 8054f929f..efb7dabb6 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2006-09-21 22:02+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -272,8 +272,12 @@ msgstr "Emplacement de votre certificat X509 au format PEM�:"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:8001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full location of the file containing your X509  "
+#| "certificate in PEM format."
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Veuillez indiquer l'emplacement du fichier contenant votre certificat X509 "
@@ -306,8 +310,14 @@ msgstr "Longueur (en bits) de la cl� RSA � cr�er�:"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -349,10 +359,17 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Si vous ne voulez pas cr�er de certificat autosign�, cet outil "
 "d'installation ne fera que cr�er la cl� priv�e RSA et la demande de "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 20a0517d1..264785840 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: strongSwan 2.7.3+dfsg-1\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2006-10-19 07:45+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -266,8 +266,12 @@ msgstr "PEM 形式の X509 証明書のファイル名:"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:8001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full location of the file containing your X509  "
+#| "certificate in PEM format."
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "PEM 形式の X509 証明書を含んでいるファイルの場所を絶対パスで入力してくださ"
@@ -300,8 +304,14 @@ msgstr "RSA 鍵の鍵長（ビット数）:"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -338,10 +348,17 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "自己署名証明書を生成したくない場合、このインストーラは RSA 秘密鍵と証明書要求"
 "のみを生成します。そして、認証局に証明書要求へ署名をしてもらう必要がありま"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 22ab0725f..ef769df41 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: strongswan_2.7.3+dfsg-1_nl\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2006-09-28 19:50+0200\n"
 "Last-Translator: Kurt De Bree <kdebree@telenet.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -280,8 +280,12 @@ msgstr "Bestandsnaam van uw X509-certificaat in PEM-formaat:"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:8001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full location of the file containing your X509  "
+#| "certificate in PEM format."
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Geef de volledige locatie van het bestand dat uw X509-certificaat in PEM-"
@@ -314,8 +318,14 @@ msgstr "Lengte van de aangemaakte RSA-sleutel (in bits):"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -355,10 +365,17 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Als u geen door uzelf getekend certificaat wilt aanmaken, dan zal deze "
 "installatie enkel de private RSA-sleutel en de certificaataanvraag aanmaken "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index ff0d230b8..810487686 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: strongswan 2.8.3-1\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2006-08-25 17:56+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2007-03-15 23:46+0000\n"
 "Last-Translator: Luísa Lourenço <kikentai@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -55,7 +55,8 @@ msgstr ""
 "montadas) e não usa uma placa de rede PCMCIA. então é melhor iniciar o "
 "strongSwan o mais cedo possível, permitindo assim aos pontos de montagem NFS "
 "serem segurados pelo IPSec. Neste caso (ou se não entende ou não quer saber "
-"deste assunto), responda \"o mais cedo possível\" a esta questão (por omissão)."
+"deste assunto), responda \"o mais cedo possível\" a esta questão (por "
+"omissão)."
 
 #. Type: select
 #. Description
@@ -82,10 +83,10 @@ msgid ""
 "\" in this case. This is also the correct answer if you want to fetch keys "
 "from a locally running DNS server with DNSSec support."
 msgstr ""
-"Se usa uma placa de rede PCMCIA para as suas ligações IPSec, então só tem "
-"de escolher para iniciar depois do serviços PCMCIA. Responda \"depois do "
-"PCMCIA\" neste caso. Esta também é a reposta correcta se quiser obter chaves "
-"de um servidor de DNS a correr localmente com suporte para DNSSec."
+"Se usa uma placa de rede PCMCIA para as suas ligações IPSec, então só tem de "
+"escolher para iniciar depois do serviços PCMCIA. Responda \"depois do PCMCIA"
+"\" neste caso. Esta também é a reposta correcta se quiser obter chaves de um "
+"servidor de DNS a correr localmente com suporte para DNSSec."
 
 #. Type: boolean
 #. Description
@@ -111,12 +112,46 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:3001
+#, fuzzy
+#| msgid "Do you wish to restart strongSwan?"
+msgid "Do you wish to support IKEv1?"
+msgstr "Deseja reiniciar o strongSwan?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:3001
+msgid ""
+"strongSwan supports both versions of the Internet Key Exchange protocol, "
+"IKEv1 and IKEv2. Do you want to start the \"pluto\" daemon for IKEv1 support "
+"when strongSwan is started?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:4001
+#, fuzzy
+#| msgid "Do you wish to restart strongSwan?"
+msgid "Do you wish to support IKEv2?"
+msgstr "Deseja reiniciar o strongSwan?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:4001
+msgid ""
+"strongSwan supports both versions of the Internet Key Exchange protocol, "
+"IKEv1 and IKEv2. Do you want to start the \"charon\" daemon for IKEv2 "
+"support when strongSwan is started?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan.templates.master:5001
 msgid "Do you want to create a RSA public/private keypair for this host?"
 msgstr "Deseja criar um par de chaves públicas/privadas RSA para esta máquina?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:3001
+#: ../strongswan.templates.master:5001
 msgid ""
 "This installer can automatically create a RSA public/private keypair for "
 "this host. This keypair can be used to authenticate IPSec connections to "
@@ -126,51 +161,51 @@ msgid ""
 "connection, but for a larger number of connections RSA authentication is "
 "easier to administer and more secure."
 msgstr ""
-"Este instalador pode criar automaticamente um par de chaves públicas/privadas "
-"RSA para esta máquina. Este par de chaves pode ser usado para autenticar "
-"ligações IPSec a outras máquinas e é o método preferido para criar ligações "
-"IPSec seguras. A outra possibilidade seria usar segredos partilhados "
-"(palavras chaves que são as mesmas em ambos os sentidos do túnel) para "
-"autenticação de uma ligação, mas para um largo número de ligações a "
-"autenticação por RSA é mais fácil de administrar e mais segura."
+"Este instalador pode criar automaticamente um par de chaves públicas/"
+"privadas RSA para esta máquina. Este par de chaves pode ser usado para "
+"autenticar ligações IPSec a outras máquinas e é o método preferido para "
+"criar ligações IPSec seguras. A outra possibilidade seria usar segredos "
+"partilhados (palavras chaves que são as mesmas em ambos os sentidos do "
+"túnel) para autenticação de uma ligação, mas para um largo número de "
+"ligações a autenticação por RSA é mais fácil de administrar e mais segura."
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:3001
+#: ../strongswan.templates.master:5001
 msgid ""
 "If you do not want to create a new public/private keypair, you can choose to "
 "use an existing one."
 msgstr ""
-"Se não quiser criar um novo par de chaves pública/privada, pode escolher usar "
-"um já existente."
+"Se não quiser criar um novo par de chaves pública/privada, pode escolher "
+"usar um já existente."
 
 #. Type: select
 #. Choices
-#: ../strongswan.templates.master:4001
+#: ../strongswan.templates.master:6001
 msgid "x509, plain"
 msgstr "x509, simples"
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid "The type of RSA keypair to create:"
 msgstr "O tipo de par de chaves RSA a criar:"
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid ""
 "It is possible to create a plain RSA public/private keypair for use with "
 "strongSwan or to create a X509 certificate file which contains the RSA "
 "public key and additionally stores the corresponding private key."
 msgstr ""
 "É possível criar um par de chaves pública/privada RSA simples para uso com o "
-"strongSwan ou criar um ficheiro certificado X509 que contenha a chave pública "
-"RSA e que adicionalmente guarde a correspondente chave privada."
+"strongSwan ou criar um ficheiro certificado X509 que contenha a chave "
+"pública RSA e que adicionalmente guarde a correspondente chave privada."
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid ""
 "If you only want to build up IPSec connections to hosts also running "
 "strongSwan, it might be a bit easier using plain RSA keypairs. But if you "
@@ -179,16 +214,16 @@ msgid ""
 "extract the RSA public key in plain format if the other side runs strongSwan "
 "without X509 certificate support."
 msgstr ""
-"Se só quiser criar ligações IPSec para máquinas também a correr o strongSwan, "
-"poderá ser um pouco mais fácil usar pares de chaves RSA simples. Mas se "
-"quiser ligar a outras implementações IPSec, irá precisar um certificado X509. "
-"Também é possível criar aqui um certificado X509 e extrair a chave pública "
-"RSA em formato simples se o outro lado correr o strongSwan sem suporte para "
-"certificados X509."
+"Se só quiser criar ligações IPSec para máquinas também a correr o "
+"strongSwan, poderá ser um pouco mais fácil usar pares de chaves RSA simples. "
+"Mas se quiser ligar a outras implementações IPSec, irá precisar um "
+"certificado X509. Também é possível criar aqui um certificado X509 e extrair "
+"a chave pública RSA em formato simples se o outro lado correr o strongSwan "
+"sem suporte para certificados X509."
 
 #. Type: select
 #. Description
-#: ../strongswan.templates.master:4002
+#: ../strongswan.templates.master:6002
 msgid ""
 "Therefore a X509 certificate is recommended since it is more flexible and "
 "this installer should be able to hide the complex creation of the X509 "
@@ -200,13 +235,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:5001
+#: ../strongswan.templates.master:7001
 msgid "Do you have an existing X509 certificate file for strongSwan?"
 msgstr "Tem um ficheiro de certificado X509 existente para o strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:5001
+#: ../strongswan.templates.master:7001
 msgid ""
 "This installer can automatically extract the needed information from an "
 "existing X509 certificate with a matching RSA private key. Both parts can be "
@@ -214,23 +249,27 @@ msgid ""
 "certificate and key file and want to use it for authenticating IPSec "
 "connections, then please answer yes."
 msgstr ""
-"Este instalador pode extrair automaticamente a informação necessária a partir "
-"de um certificado X509 existente com uma chave privada RSA que coincida. "
-"Ambas as partes podem estar num ficheiro, se estiver no formato PEM. Se "
-"tiver tal ficheiro de certificado e chave existente e quiser usar para "
-"autenticar conexões IPSec, então por favor responda sim."
+"Este instalador pode extrair automaticamente a informação necessária a "
+"partir de um certificado X509 existente com uma chave privada RSA que "
+"coincida. Ambas as partes podem estar num ficheiro, se estiver no formato "
+"PEM. Se tiver tal ficheiro de certificado e chave existente e quiser usar "
+"para autenticar conexões IPSec, então por favor responda sim."
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:6001
+#: ../strongswan.templates.master:8001
 msgid "File name of your X509 certificate in PEM format:"
 msgstr "Nome de ficheiro para o seu certificado X509 em formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:6001
+#: ../strongswan.templates.master:8001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full location of the file containing your X509  "
+#| "certificate in PEM format."
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Por favor insira a localização completa do ficheiro que contém o certificado "
@@ -238,13 +277,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:7001
+#: ../strongswan.templates.master:9001
 msgid "File name of your X509 private key in PEM format:"
 msgstr "Nome do ficheiro da sua chave privada X509 em formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:7001
+#: ../strongswan.templates.master:9001
 msgid ""
 "Please enter the full location of the file containing the private RSA key "
 "matching your X509 certificate in PEM format. This can be the same file that "
@@ -256,15 +295,21 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:8001
+#: ../strongswan.templates.master:10001
 msgid "The length of the created RSA key (in bits):"
 msgstr "O tamanho da chave RSA criada (em bits):"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:8001
+#: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -276,13 +321,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:9001
+#: ../strongswan.templates.master:11001
 msgid "Do you want to create a self-signed X509 certificate?"
 msgstr "Deseja criar certificado X509 auto-assinado?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:9001
+#: ../strongswan.templates.master:11001
 msgid ""
 "This installer can only create self-signed X509 certificates automatically, "
 "because otherwise a certificate authority is needed to sign the certificate "
@@ -298,16 +343,23 @@ msgstr ""
 "certificado auto-assinado, poderá usá-lo imediatamente para ligar a outras "
 "máquinas IPSec que suportem certificados X509 para autenticação de ligações "
 "IPSec. No entanto, se quiser usar as novas funcionalidades PKI do strongSwan "
-">= 1.91, irá precisar de ter todos os certificados X509 assinados por "
-"uma só autoridade de certificados para criar um caminho de confiança."
+">= 1.91, irá precisar de ter todos os certificados X509 assinados por uma só "
+"autoridade de certificados para criar um caminho de confiança."
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:9001
+#: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Se não quiser criar um certificado auto-assinado, então este instalador só "
 "irá criar a chave privada RSA e o pedido de certificado e você terá que "
@@ -315,13 +367,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid "Country code for the X509 certificate request:"
 msgstr "Código de país para o pedido de certificado:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid ""
 "Please enter the 2 letter country code for your country. This code will be "
 "placed in the certificate request."
@@ -331,7 +383,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid ""
 "You really need to enter a valid country code here, because openssl will "
 "refuse to generate certificates without one. An empty field is allowed for "
@@ -343,19 +395,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:10001
+#: ../strongswan.templates.master:12001
 msgid "Example: AT"
 msgstr "Exemplo: PT"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:11001
+#: ../strongswan.templates.master:13001
 msgid "State or province name for the X509 certificate request:"
 msgstr "Estado ou nome da província para o pedido do certificado X509:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:11001
+#: ../strongswan.templates.master:13001
 msgid ""
 "Please enter the full name of the state or province you live in. This name "
 "will be placed in the certificate request."
@@ -365,19 +417,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:11001
+#: ../strongswan.templates.master:13001
 msgid "Example: Upper Austria"
 msgstr "Exemplo: Trás-os-Montes"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:12001
+#: ../strongswan.templates.master:14001
 msgid "Locality name for the X509 certificate request:"
 msgstr "Nome da localidade para o pedido de certificado X509:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:12001
+#: ../strongswan.templates.master:14001
 msgid ""
 "Please enter the locality (e.g. city) where you live. This name will be "
 "placed in the certificate request."
@@ -387,41 +439,41 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:12001
+#: ../strongswan.templates.master:14001
 msgid "Example: Vienna"
 msgstr "Exemplo: Vila Real"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:13001
+#: ../strongswan.templates.master:15001
 msgid "Organization name for the X509 certificate request:"
 msgstr "Nome da organização para o pedido de certificado X509:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:13001
+#: ../strongswan.templates.master:15001
 msgid ""
 "Please enter the organization (e.g. company) that the X509 certificate "
 "should be created for. This name will be placed in the certificate request."
 msgstr ""
-"Por favor insira a organização (ex. companhia) para o qual o certificado X509 "
-"deve ser criado. Este nome irá ser colocado no pedido de certificado."
+"Por favor insira a organização (ex. companhia) para o qual o certificado "
+"X509 deve ser criado. Este nome irá ser colocado no pedido de certificado."
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:13001
+#: ../strongswan.templates.master:15001
 msgid "Example: Debian"
 msgstr "Exemplo: Debian"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:14001
+#: ../strongswan.templates.master:16001
 msgid "Organizational unit for the X509 certificate request:"
 msgstr "Unidade da organização para o pedido de certificado:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:14001
+#: ../strongswan.templates.master:16001
 msgid ""
 "Please enter the organizational unit (e.g. section) that the X509 "
 "certificate should be created for. This name will be placed in the "
@@ -433,19 +485,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:14001
+#: ../strongswan.templates.master:16001
 msgid "Example: security group"
 msgstr "Exemplo: grupo de segurança"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:15001
+#: ../strongswan.templates.master:17001
 msgid "Common name for the X509 certificate request:"
 msgstr "Nome comum para o pedido de certificado X509:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:15001
+#: ../strongswan.templates.master:17001
 msgid ""
 "Please enter the common name (e.g. the host name of this machine) for which "
 "the X509 certificate should be created for. This name will be placed in the "
@@ -457,19 +509,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:15001
+#: ../strongswan.templates.master:17001
 msgid "Example: gateway.debian.org"
 msgstr "Exemplo: gateway.debian.org"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:16001
+#: ../strongswan.templates.master:18001
 msgid "Email address for the X509 certificate request:"
 msgstr "Endereço de email para o pedido de certificado X509:"
 
 #. Type: string
 #. Description
-#: ../strongswan.templates.master:16001
+#: ../strongswan.templates.master:18001
 msgid ""
 "Please enter the email address of the person or organization who is "
 "responsible for the X509 certificate, This address will be placed in the "
@@ -481,13 +533,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:17001
+#: ../strongswan.templates.master:19001
 msgid "Do you wish to enable opportunistic encryption in strongSwan?"
 msgstr "Deseja activar encriptação oportunística no strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:17001
+#: ../strongswan.templates.master:19001
 msgid ""
 "strongSwan comes with support for opportunistic encryption (OE), which "
 "stores IPSec authentication information (i.e. RSA public keys) in "
@@ -498,17 +550,17 @@ msgid ""
 "default route) as soon as pluto (the strongSwan keying daemon) is started."
 msgstr ""
 "O strongSwan vem com suporte para encriptação oportunística (OE), a qual "
-"guarda informação de autenticação IPSec (i.e. chaves públicas RSA) em ("
-"preferêncialmente seguros) registos DNS. Até que isto seja largamente "
-"espalhado, activá-lo irá causar um abrandamento significativo para cada nova, "
-"ligação de saída. Desde a versão 2.0, upstream, o strongSwan vem com o OE "
-"activado por omissão e é por isso provável deitar abaixo a sua ligação "
+"guarda informação de autenticação IPSec (i.e. chaves públicas RSA) em "
+"(preferêncialmente seguros) registos DNS. Até que isto seja largamente "
+"espalhado, activá-lo irá causar um abrandamento significativo para cada "
+"nova, ligação de saída. Desde a versão 2.0, upstream, o strongSwan vem com o "
+"OE activado por omissão e é por isso provável deitar abaixo a sua ligação "
 "existente à internet (i.e a sua rota por omissão) assim que o pluto (o "
 "keying daemon do strongSwan) é iniciado."
 
 #. Type: boolean
 #. Description
-#: ../strongswan.templates.master:17001
+#: ../strongswan.templates.master:19001
 msgid ""
 "Please choose whether you want to enable support for OE. If unsure, do not "
 "enable it."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index a427a6d81..b5f2d99df 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openswan\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2005-01-24 21:53-0200\n"
 "Last-Translator: Andr� Lu�s Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -293,7 +293,7 @@ msgstr ""
 #: ../strongswan.templates.master:8001
 #, fuzzy
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Por favor, informe a localiza��o do arquivo contendo seu certificado X509 no "
@@ -330,8 +330,14 @@ msgstr "Qual deve ser o tamanho da chave RSA criada ?"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -374,10 +380,17 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Caso voc� n�o queira criar um certificado auto-assinado, este instalador ir� "
 "somente criar a chave privada RSA e a requisi��o de certificado e voc� ter� "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 0e86a7167..6dd81e571 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openswan 2.4.0-3\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2005-11-16 00:22+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -289,7 +289,7 @@ msgstr "Ange platsen f�r ditt X509-certifikat i PEM-format."
 #: ../strongswan.templates.master:8001
 #, fuzzy
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Ange platsen f�r din fil som inneh�ller ditt X509-certifikat i PEM-format."
@@ -324,8 +324,14 @@ msgstr "Vilken l�ngd ska den skapade RSA-nyckeln ha ?"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -367,10 +373,17 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Om du inte vill skapa ett sj�lv-signerat certifikat kommer denna "
 "installerare bara att skapa den privata RSA-nyckeln och certifikatf�rfr�gan "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 039617150..80b51705e 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+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"
@@ -212,7 +212,7 @@ msgstr ""
 #. Description
 #: ../strongswan.templates.master:8001
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 #. Description
 #: ../strongswan.templates.master:10001
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -272,7 +272,8 @@ msgstr ""
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 
 #. Type: string
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 3e114d15d..e2345d781 100755
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openswan 1/2.2.0-10\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2007-06-03 21:36+0100\n"
+"POT-Creation-Date: 2007-07-05 01:24+0100\n"
 "PO-Revision-Date: 2005-07-03 13:49+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -278,7 +278,7 @@ msgstr "Hãy nhập địa điểm của chứng nhận X509 của bạn, có d�
 #: ../strongswan.templates.master:8001
 #, fuzzy
 msgid ""
-"Please enter the full location of the file containing your X509  certificate "
+"Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
 "Hãy nhập địa điểm của tập tin chứa chứng nhận X509 của bạn, có dạng PEM."
@@ -312,8 +312,14 @@ msgstr "Khóa RSA mới được tạo nên có độ dài nào?"
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of the created RSA key. it should not be less "
+#| "than 1024 bits because this should be considered unsecure and you will "
+#| "probably not need anything more than 2048 bits because it only slows the "
+#| "authentication process down and is not needed at the moment."
 msgid ""
-"Please enter the length of the created RSA key. it should not be less than "
+"Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
 "not need anything more than 2048 bits because it only slows the "
 "authentication process down and is not needed at the moment."
@@ -355,10 +361,17 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:11001
+#, fuzzy
+#| msgid ""
+#| "If you do not want to create a self-signed certificate, then this "
+#| "installer will only create the RSA private key and the certificate "
+#| "request and you will have to sign the certificate request with your "
+#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
-"will have to sign the certificate request with your certificate authority."
+"will have to get the certificate request signed by your certificate "
+"authority."
 msgstr ""
 "Nếu bạn không muốn tạo một chứng nhận tự ký, thì trình cài đặt này sẽ tạo "
 "chỉ khóa RSA riêng và lời yêu cầu chứng nhận, và bạn sẽ phải ký lời yêu cầu "