- Updated translations.

- Import NMU patches.

23 files changed, 5417 insertions, 3497 deletions

diff --git a/debian/changelog b/debian/changelog
index 048b2fda9..d334ba363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,59 @@
-strongswan (4.2.14-2) unstable; urgency=low
+strongswan (4.2.14-2) unstable; urgency=HIGH
 
+  Urgency high because of security issue and FTBFS.
   * Fix padlock handling for i386 in debian/rules.
+    Closes: #525652
+  * Acknowledge NMUs by security team.
+    Closes: #533837, #531612
+  * Add "Conflicts: strongswan (< 4.2.12-1)" to libstrongswan, 
+    strongswan-starter, strongswan-ikev1, and strongswan-ikev2 to force
+    update of the strongswan package on installation and avoid conflicts
+    caused by package restructuring.
+    Closes: #526037: strongswan-ikev2 and strongswan: error when trying to 
+                     install together
+    Closes: #526486: strongswan and libstrongswan: error when trying to 
+                     install together
+    Closes: #526487: strongswan-ikev1 and strongswan: error when trying to 
+                     install together
+    Closes: #526488: strongswan-starter and strongswan: error when trying to 
+                     install together
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #528073
+  * Debconf translation updates:
+    Closes: #525234: [INTL:ja] Update po-debconf template translation (ja.po) 
+    Closes: #528323: [INTL:sv] po-debconf file for strongswan 
+    Closes: #528370: [INTL:vi] Vietnamese debconf templates translation update 
+    Closes: #529027: [INTL:pt] Updated Portuguese translation for debconf messages
+    Closes: #529071: [INTL:fr] French debconf templates translation update 
+    Closes: #529592: nb translation of debconf PO for strongSWAN 
+    Closes: #529638: [INTL:ru] Russian debconf templates translation 
+    Closes: #529661: Updated Czech translation of strongswan debconf messages 
+    Closes: #529742: [INTL:eu] strongswan debconf basque translation 
+    Closes: #530273: [INTL:fi] Finnish translation of the debconf templates
+    Closes: #529063: [INTL:gl] strongswan 4.2.14-2 debconf translation update
 
  -- Rene Mayrhofer <rmayr@debian.org>  Sat, 18 Apr 2009 20:28:51 +0200
 
+strongswan (4.2.14-1.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix build on i386 
+    Closes: #525652: FTBFS on i386: 
+    libstrongswan-padlock.so*': No such file or directory 
+  * Fix Two Denial of Service Vulnerabilities
+    Closes: #533837: strongSwan Two Denial of Service Vulnerabilities
+
+ -- Ruben Puettmann <ruben@puettmann.net>  Sun, 21 Jun 2009 17:50:02 +0200
+ 
+strongswan (4.2.14-1.1) unstable; urgency=high
+ 
+  * Non-maintainer upload by the Security Team.
+  * Fix two possible null pointer dereferences leading to denial
+    of service via crafted IKE_SA_INIT, CREATE_CHILD_SA or
+    IKE_AUTH request (CVE-2009-1957; CVE-2009-1958; Closes: #531612).
+
+ -- Nico Golde <nion@debian.org>  Mon, 15 Jun 2009 13:06:05 +0200
+ 
 strongswan (4.2.14-1) unstable; urgency=low
 
   * New upstream release, which incorporates the fix. Removed dpatch for it.
diff --git a/debian/control b/debian/control
index 1c49bbbab..981814645 100644
--- a/debian/control
+++ b/debian/control
@@ -11,36 +11,36 @@ Architecture: all
 Depends: strongswan-ikev1, strongswan-ikev2
 Suggests: network-manager-strongswan
 Description: IPsec VPN solution metapackage
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
- native IPsec stack and runs on any recent 2.6 kernel (no patching required).
- It supports both IKEv1 and the newer IKEv2 protocols.
+ The strongSwan VPN suite is based on the IPsec stack in standard Linux 2.6
+ kernels. It supports both the IKEv1 and IKEv2 protocols.
  .
- strongSwan is one of the two remaining forks of the original FreeS/WAN 
- project and focuses on IKEv2 support, X.509 authentication and complete PKI 
- support. For a focus on Opportunistic Encryption (OE) and interoperability 
+ StrongSwan is one of the two remaining forks of the original FreeS/WAN
+ project and focuses on IKEv2 support, X.509 authentication and complete PKI
+ support. For a focus on Opportunistic Encryption (OE) and interoperability
  with non-standard IPsec features, see Openswan.
  .
- This metapackage has dependencies to the IKEv1 daemon pluto and IKEv2 daemon
- charon. It installs the required packages to run IKEv1 and IKEv2 connections
- using a ipsec.conf/ipsec.secrets based configuration.
+ This metapackage installs the packages required to maintain IKEv1 and IKEv2
+ connections via ipsec.conf or ipsec.secrets.
 
 Package: libstrongswan
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, openssl
+Conflicts: strongswan (< 4.2.12-1)
 Description: strongSwan utility and crypto library
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
- libstrongswan is the underlying library of charon and other strongSwan
+ This package provides the underlying library of charon and other strongSwan
  components. It is built in a modular way and is extendable through various
  plugins.
 
 Package: strongswan-starter
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan, strongswan-ikev1 | strongswan-ikev2
+Conflicts: strongswan (< 4.2.12-1)
 Description: strongSwan daemon starter and configuration file parser
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
@@ -55,14 +55,14 @@ Pre-Depends: debconf | debconf-2.0
 Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-starter, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
 Suggests: curl
 Provides: ike-server
-Conflicts: freeswan (<< 2.04-12), openswan
+Conflicts: freeswan (<< 2.04-12), openswan, strongswan (< 4.2.12-1)
 Replaces: openswan
-Description: strongSwan IKEv1 keying daemon
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+Description: strongSwan Internet Key Exchange (v1) daemon
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
- Pluto is a IPsec IKEv1 keying daemon. It was inherited from the FreeS/WAN
+ Pluto is an IPsec IKEv1 daemon. It was inherited from the FreeS/WAN
  project, but provides improved X.509 certificate support and other features.
  .
  Pluto can run in parallel with charon, the newer IKEv2 daemon.
@@ -73,13 +73,13 @@ Pre-Depends: debconf | debconf-2.0
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan, strongswan-starter | strongswan-nm, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
 Suggests: curl
 Provides: ike-server
-Conflicts: freeswan (<< 2.04-12), openswan
-Description: strongSwan IKEv2 keying daemon
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+Conflicts: freeswan (<< 2.04-12), openswan, strongswan (< 4.2.12-1)
+Description: strongSwan Internet Key Exchange (v2) daemon
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
- Charon is the IPsec IKEv2 keying daemon of the strongSwan project. It is
+ Charon is an IPsec IKEv2 daemon. It is
  written from scratch using a fully multi-threaded design and a modular
  architecture. Various plugins provide additional functionality.
  .
@@ -90,11 +90,11 @@ Architecture: any
 Depends: ${shlibs:Depends}, strongswan-ikev2
 Recommends: network-manager-strongswan
 Description: strongSwan plugin to interact with NetworkManager
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
  This plugin provides an interface which allows NetworkManager to configure
- and control the IKEv2 daemon directly through DBUS. It is designed to work
+ and control the IKEv2 daemon directly through D-Bus. It is designed to work
  in conjunction with the network-manager-strongswan package, providing
  a simple graphical frontend to configure IPsec based VPNs.
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 5e64290bd..60a044694 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: strongswan\n"
 "Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
-"PO-Revision-Date: 2008-05-12 19:17+0200\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 14:47+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,563 +23,627 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "\"co nejdříve\", \"po NFS\", \"po PCMCIA\""
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "co nejdříve"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
-msgstr "Kdy spustit strongSwan:"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "po NFS"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
-msgstr ""
-"Existují tři možnosti, kdy se dá strongSwan spouštět: před NFS službami, po "
-"NFS službách nebo po PCMCIA službách. Správná odpověď závisí na vašem "
-"konkrétním nastavení."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "po PCMCIA"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"Jestliže nemáte svůj strom /usr připojen skrz NFS (buď přes NFS připojujete "
-"jiné, ne tak důležité stromy, nebo NFS vůbec nepoužíváte) a nepoužíváte "
-"síťovou kartu PCMCIA, je nejlepší spouštět strongSwan co nejdříve, čímž "
-"umožníte aby byly NFS svazky chráněny pomocí IPSec. V takovém případě (nebo "
-"pokud si nejste jisti, nebo pokud vám na tom nezáleží) na otázku odpovězte "
-"„co nejdříve“ (výchozí)."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Kdy spustit strongSwan:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
 msgstr ""
-"Jestliže máte strom /usr připojen skrz NFS a nepoužíváte síťovou kartu "
-"PCMCIA, musíte spustit strongSwan po NFS, aby byly všechny potřebné soubory "
-"dostupné. V tomto případě na otázku odpovězte „po NFS“. Uvědomte si prosím, "
-"že v tomto případě nemůže být NFS svazek /usr chráněn pomocí IPSec."
+"strongSwan se spouští při zavádění systému, takže může chránit automaticky "
+"připojované souborové systémy."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
-"Jestliže používáte PCMCIA síťovou kartu pro vaše IPSec připojení, pak je "
-"jedinou možností jej spustit po PCMCIA službách. V tom případě odpovězte „po "
-"PCMCIA“. Toto je také správná odpověď, pokud chcete získat klíče z lokálního "
-"DNS serveru s podporou DNSSec."
+" * co nejdříve: pokud není /usr připojeno přes NFS a nepoužíváte\n"
+"   síťovou kartu PCMCIA, je lepší spustit strongSwan co nejdříve,\n"
+"   aby bylo NFS chráněno pomocí IPSec;\n"
+" * po NFS: doporučeno, pokud je /usr připojeno přes NFS a pokud\n"
+"   nepoužíváte síťovou kartu PCMCIA;\n"
+" * po PCMCIA: doporučeno pokud IPSec spojení používá síťovou kartu\n"
+"   PCMCIA, nebo pokud vyžaduje stažení klíčů z lokálně běžícího DNS\n"
+"   serveru s podporou DNSSec."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
-msgstr "Přejete si restartovat strongSwan?"
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Restartovat nyní strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
 "Restartování strongSwan je dobrý nápad, protože v případě, že aktualizace "
-"obsahuje bezpečnostní záplatu, nebude opravena dokud se démon nerestartuje. "
-"Většina lidí předpokládá restartování démona, takže je to v každém případě "
-"správný postup. Nicméně je možné, že existující spojení budou shozena a poté "
-"znovu nastavena."
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates:3001
-msgid "Do you wish to support IKEv1?"
-msgstr "Přejete si podporu IKEv1?"
+"obsahuje bezpečnostní záplatu, nebude tato funkční, dokud se démon "
+"nerestartuje. Nicméně je možné, že existující spojení budou ukončena a poté "
+"znovu nahozena."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
-"strongSwan podporuje protokol Internet Key Exchange ve verzích 1 a 2 (IKEv1, "
-"IKEv2). Přejete si při startu strongSwanu spustit daemona „pluto“ "
-"podporujícího IKEv1?"
+"Pokud nerestartujete strongSwan nyní, měli byste to provést při nejbližší "
+"příležitosti."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-msgid "Do you wish to support IKEv2?"
-msgstr "Přejete si podporu IKEv2?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Spustit strongSwan daemon IKEv1?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"strongSwan podporuje protokol Internet Key Exchange ve verzích 1 a 2 (IKEv1, "
-"IKEv2). Přejete si při startu strongSwanu spustit daemona „charon“ "
-"podporujícího IKEv2?"
+"Pro podporu 1. verze protokolu Internet Key Exchange musí běžet daemon pluto."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-msgid "Do you want to create a RSA public/private keypair for this host?"
-msgstr "Přejete si vytvořit veřejný/soukromý pár RSA klíčů pro tento počítač?"
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Spustit strongSwan daemon IKEv2?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"Tento instalátor může automaticky vytvořit veřejný/soukromý pár RSA klíčů "
-"pro tento počítač. Pár klíčů může být využit k autentizaci IPSec spojení na "
-"další počítače a je upřednostňovanou cestou pro sestavování bezpečných IPSec "
-"spojení. Další možností autentizace je využití sdílených tajemství (hesel, "
-"která jsou stejná na obou stranách tunelu), ale pro větší počet spojení je "
-"RSA autentizace snazší pro správu a mnohem bezpečnější."
+"Pro podporu 2. verze protokolu Internet Key Exchange musí běžet daemon "
+"charon."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "If you do not want to create a new public/private keypair, you can choose "
-#| "to use an existing one."
-msgid ""
-"If you do not want to create a new public/private keypair, you can choose to "
-"use an existing one in the next step."
-msgstr ""
-"Jestliže si nepřejete vytvořit nový pár klíčů pro tento počítač, můžete si "
-"zvolit existující."
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Vytvořit veřejný/soukromý pár RSA klíčů pro tento počítač?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid "Do you have an existing X509 certificate file for strongSwan?"
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
 msgstr ""
-"Vlastníte existující certifikát X509, který chcete použít pro strongSwan?"
+"strongSwan může pro autentizaci IPSec spojení s jinými počítači používat "
+"předsdílený klíč (PSK), nebo veřejný/soukromý pár RSA klíčů. RSA autentizace "
+"se považuje za bezpečnější a jednodušší na správu. Autentizace PSK a RSA "
+"můžete používat současně."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically extract the needed information from an "
-#| "existing X509 certificate with a matching RSA private key. Both parts can "
-#| "be in one file, if it is in PEM format. If you have such an existing "
-#| "certificate and key file and want to use it for authenticating IPSec "
-#| "connections, then please answer yes."
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
 msgstr ""
-"Instalátor může automaticky získat potřebné informace z existujícího "
-"certifikátu X509 s odpovídajícím soukromým RSA klíčem. Jedná-li se o formát "
-"PEM, mohou být obě části v jednom souboru. Vlastníte-li takový certifikát a "
-"soubor s klíčem a chcete-li je použít pro autentizaci IPSec spojení, "
-"odpovězte kladně."
+"Jestliže si nepřejete vytvořit nový pár klíčů pro tento počítač, můžete si v "
+"příštím kroku zvolit existující klíče."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, fuzzy
-#| msgid "File name of your X509 certificate in PEM format:"
-msgid "File name of your X.509 certificate in PEM format:"
-msgstr "Jméno souboru s certifikátem X509 ve formátu PEM:"
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Použít pro strongSwan existující certifikát X.509?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, 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 X.509 certificate "
-"in PEM format."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
-"Zadejte prosím celou cestu k souboru obsahujícímu váš certifikát X509 ve "
-"formátu PEM."
+"Potřebné informace lze získat automaticky z existujícího certifikátu X.509 s "
+"odpovídajícím soukromým RSA klíčem. Jedná-li se o formát PEM, mohou být obě "
+"části v jednom souboru. Vlastníte-li takový certifikát a soubor s klíčem a "
+"chcete-li je použít pro autentizaci IPSec spojení, odpovězte kladně."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| msgid "File name of your X509 private key in PEM format:"
-msgid "File name of your X.509 private key in PEM format:"
-msgstr "Jméno souboru se soukromým klíčem X509 ve formátu PEM:"
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Jméno souboru s certifikátem X.509 ve formátu PEM:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| 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 contains the X509 certificate."
 msgid ""
-"Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
 msgstr ""
-"Zadejte prosím absolutní cestu k souboru obsahujícímu soukromý RSA klíč ve "
-"formátu PEM odpovídající vašemu certifikátu X509. Může to být stejný soubor "
-"jako ten, ve kterém se nachází certifikát X509."
+"Zadejte celou cestu k souboru obsahujícímu váš certifikát X.509 ve formátu "
+"PEM."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
-msgstr "Délka vytvořeného RSA klíče (v bitech):"
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Jméno souboru se soukromým klíčem X.509 ve formátu PEM:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
 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."
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
-"Zadejte prosím délku vytvářeného RSA klíče. Kvůli bezpečnosti by neměla být "
-"menší než 1024 bitů a pravděpodobně nepotřebujete víc než 2048 bitů, protože "
-"to již zpomaluje proces autentizace."
+"Zadejte prosím absolutní cestu k souboru obsahujícímu soukromý RSA klíč ve "
+"formátu PEM odpovídající vašemu certifikátu X.509. Může to být stejný soubor "
+"jako ten, ve kterém se nachází certifikát X.509."
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid "Do you want to create a self-signed X509 certificate?"
-msgid "Do you want to create a self-signed X.509 certificate?"
-msgstr "Chcete vytvořit certifikát X509 podepsaný sám sebou?"
+msgid "RSA key length:"
+msgstr "Délka RSA klíče:"
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid ""
-#| "This installer can only create self-signed X509 certificates "
-#| "automatically, because otherwise a certificate authority is needed to "
-#| "sign the certificate request. If you want to create a self-signed "
-#| "certificate, you can use it immediately to connect to other IPSec hosts "
-#| "that support X509 certificate for authentication of IPSec connections. "
-#| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
-#| "you will need to have all X509 certificates signed by a single "
-#| "certificate authority to create a trust path."
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"Tento instalátor může automaticky vytvořit pouze certifikát X509 podepsaný "
-"sám sebou, jelikož v opačném případě je k podpisu certifikátu potřeba "
-"certifikační autorita. Tento certifikát můžete ihned použít k připojení na "
-"další počítače s IPSec, které podporují autentizaci pomocí certifikátu X509. "
-"Nicméně chcete-li využít nových PKI možností strongSwanu >= 1.91, budete k "
-"vytvoření důvěryhodných cest potřebovat všechny certifikáty X509 podepsané "
-"jedinou certifikační autoritou."
+"Zadejte prosím délku vytvářeného RSA klíče. Z důvodu bezpečnosti by neměla "
+"být menší než 1024 bitů. Hodnota větší než 2048 bitů může ovlivnit výkon."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-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 get the certificate request signed by your certificate "
-"authority."
-msgstr ""
-"Jestliže nechcete vytvořit certifikát podepsaný sebou samým, vytvoří tento "
-"instalátor jen soukromý RSA klíč a požadavek na certifikát. Vy potom musíte "
-"podepsat požadavek svojí certifikační autoritou."
-
-#. Type: string
-#. Description
 #: ../strongswan-starter.templates:11001
-#, fuzzy
-#| msgid "Country code for the X509 certificate request:"
-msgid "Country code for the X.509 certificate request:"
-msgstr "Kód země pro požadavek na certifikát X509:"
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Vytvořit certifikát X.509 podepsaný sám sebou?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
 msgstr ""
-"Zadejte prosím dvoumístný kód vaší země. Tento kód bude umístěn do požadavku "
-"na certifikát."
+"Automaticky lze vytvořit pouze certifikát podepsaný sám sebou, protože jinak "
+"je zapotřebí certifikační autorita, která by podepsala požadavek na "
+"certifikát."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 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."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
 msgstr ""
-"Je opravdu nutné, abyste vložili správný kód země, protože openssl jinak "
-"odmítne vygenerování certifikátu. Prázdné pole je dovoleno ve všech "
-"ostatních polích certifikátu X509 kromě tohoto."
+"Odpovíte-li kladně, můžete nový certifikát ihned použít k připojení na další "
+"počítače s IPSec, které podporují autentizaci pomocí certifikátu X.509. "
+"Nicméně pro využití PKI možností ve strongSwanu je nutné, aby byly všechny "
+"certifikáty v cestě důvěry podepsány stejnou autoritou."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Příklad: CZ"
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Jestliže nechcete vytvořit certifikát podepsaný sebou samým, vytvoří se "
+"pouze soukromý RSA klíč a požadavek na certifikát. Vy potom musíte podepsat "
+"požadavek svou certifikační autoritou."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-#, fuzzy
-#| msgid "State or province name for the X509 certificate request:"
-msgid "State or province name for the X.509 certificate request:"
-msgstr "Jméno státu nebo oblasti pro požadavek na certifikát X509:"
+msgid "Country code for the X.509 certificate request:"
+msgstr "Kód země pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
-"Zadejte prosím celé jméno státu nebo oblasti kde žijete. Toto jméno bude "
-"umístěno do požadavku na certifikát."
+"Zadejte dvoumístný ISO3166 kód své země. Tento kód bude umístěn do požadavku "
+"na certifikát."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "Příklad: Morava"
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr "Toto pole je povinné, bez něj není možné certifikát vytvořit."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
-#, fuzzy
-#| msgid "Locality name for the X509 certificate request:"
-msgid "Locality name for the X.509 certificate request:"
-msgstr "Jméno lokality pro požadavek na certifikát X509:"
+msgid "State or province name for the X.509 certificate request:"
+msgstr "Jméno státu nebo oblasti pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
-"Zadejte prosím lokalitu (např. město) kde žijete. Toto jméno bude umístěno "
-"do požadavku na certifikát."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Příklad: Olomouc"
+"Zadejte celé jméno státu nebo oblasti, které se má použít v požadavku na "
+"certifikát."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| msgid "Organization name for the X509 certificate request:"
-msgid "Organization name for the X.509 certificate request:"
-msgstr "Název organizace pro požadavek na certifikát X509:"
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Jméno lokality pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
-"Zadejte prosím organizaci pro kterou je certifikát vytvářen. Toto jméno bude "
-"umístěno do požadavku na certifikát."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Příklad: Debian"
+"Zadejte jméno lokality (např. města), které se má použít v požadavku na "
+"certifikát."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| msgid "Organizational unit for the X509 certificate request:"
-msgid "Organizational unit for the X.509 certificate request:"
-msgstr "Název organizační jednotky pro požadavek na certifikát X509:"
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Název organizace pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Zadejte prosím organizační jednotku pro kterou je certifikát vytvářen. Toto "
-"jméno bude umístěno do požadavku na certifikát."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Příklad: bezpečnostní oddělení"
+"Zadejte název organizace (firmy), který se má použít v požadavku na "
+"certifikát."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-#| msgid "Common name for the X509 certificate request:"
-msgid "Common name for the X.509 certificate request:"
-msgstr "Obvyklé jméno pro požadavek na certifikát X509:"
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Název organizační jednotky pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
-"Zadejte prosím běžné jméno (např. jméno počítače) pro které je certifikát "
-"vytvářen. Toto jméno bude umístěno do požadavku na certifikát."
+"Zadejte název organizační jednotky (např. oddělení), který se má použít v "
+"požadavku na certifikát."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Příklad: gateway.debian.org"
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Obvyklé jméno pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:17001
-#, fuzzy
-#| msgid "Email address for the X509 certificate request:"
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Zadejte běžné jméno (např. jméno počítače), které se má použít v požadavku "
+"na certifikát."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
 msgid "Email address for the X.509 certificate request:"
-msgstr "Emailová adresa pro požadavek na certifikát X509:"
+msgstr "Emailová adresa pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
-#, fuzzy
-#| 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 "
-#| "certificate request."
+#: ../strongswan-starter.templates:18001
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
-"Zadejte prosím emailovou adresu osoby nebo organizace, která je zodpovědná "
-"za certifikát X509. Toto jméno bude umístěno do požadavku na certifikát."
+"Zadejte emailovou adresu osoby nebo organizace, která se má použít v "
+"požadavku na certifikát."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
-msgstr "Chcete ve strongSwanu povolit oportunistické šifrování?"
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Povolit oportunistické šifrování?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
 msgstr ""
-"strongSwan přichází s podporou pro oportunistické šifrování (OE), které "
-"uchovává autentizační informace IPSecu (např. veřejné RSA klíče) v (nejlépe "
-"zabezpečených) DNS záznamech. Dokud nebude tato schopnost více rozšířena, "
-"způsobí její aktivace výrazné zpomalení každého nového odchozího spojení. Od "
-"verze 2.0 přichází strongSwan s implicitně zapnutou podporou OE čímž "
-"pravděpodobně zruší vaše probíhající spojení do Internetu (tj. vaši výchozí "
-"cestu - default route) v okamžiku, kdy spustíte pluto (strongSwan keying "
-"démon)."
+"Tato verze strongSwan podporuje oportunistické šifrování (OE), které "
+"uchovává autentizační informace IPSecu (např. veřejné RSA klíče) v DNS "
+"záznamech. Dokud nebude tato schopnost více rozšířena, způsobí její aktivace "
+"výrazné zpomalení každého nového odchozího spojení."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"Prosím vyberte si zda chcete povolit podporu pro OE. Nejste-li si jisti, "
-"podporu nepovolujte."
+"Oportunistické šifrování byste měli povolit pouze v případě, že ho opravdu "
+"chcete. Při startu daemona pluto je možné, že se vaše probíhající spojení do "
+"Internetu přeruší (přesněji přestane fungovat výchozí cesta)."
+
+#~ msgid "earliest, \"after NFS\", \"after PCMCIA\""
+#~ msgstr "\"co nejdříve\", \"po NFS\", \"po PCMCIA\""
+
+#~ msgid ""
+#~ "There are three possibilities when strongSwan can start: before or after "
+#~ "the NFS services and after the PCMCIA services. The correct answer "
+#~ "depends on your specific setup."
+#~ msgstr ""
+#~ "Existují tři možnosti, kdy se dá strongSwan spouštět: před NFS službami, "
+#~ "po NFS službách nebo po PCMCIA službách. Správná odpověď závisí na vašem "
+#~ "konkrétním nastavení."
+
+#~ msgid ""
+#~ "If you do not have your /usr tree mounted via NFS (either you only mount "
+#~ "other, less vital trees via NFS or don't use NFS mounted trees at all) "
+#~ "and don't use a PCMCIA network card, then it's best to start strongSwan "
+#~ "at the earliest possible time, thus allowing the NFS mounts to be secured "
+#~ "by IPSec. In this case (or if you don't understand or care about this "
+#~ "issue), answer \"earliest\" to this question (the default)."
+#~ msgstr ""
+#~ "Jestliže nemáte svůj strom /usr připojen skrz NFS (buď přes NFS "
+#~ "připojujete jiné, ne tak důležité stromy, nebo NFS vůbec nepoužíváte) a "
+#~ "nepoužíváte síťovou kartu PCMCIA, je nejlepší spouštět strongSwan co "
+#~ "nejdříve, čímž umožníte aby byly NFS svazky chráněny pomocí IPSec. V "
+#~ "takovém případě (nebo pokud si nejste jisti, nebo pokud vám na tom "
+#~ "nezáleží) na otázku odpovězte „co nejdříve“ (výchozí)."
+
+#~ msgid ""
+#~ "If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
+#~ "card, then you will need to start strongSwan after NFS so that all "
+#~ "necessary files are available. In this case, answer \"after NFS\" to this "
+#~ "question. Please note that the NFS mount of /usr can not be secured by "
+#~ "IPSec in this case."
+#~ msgstr ""
+#~ "Jestliže máte strom /usr připojen skrz NFS a nepoužíváte síťovou kartu "
+#~ "PCMCIA, musíte spustit strongSwan po NFS, aby byly všechny potřebné "
+#~ "soubory dostupné. V tomto případě na otázku odpovězte „po NFS“. Uvědomte "
+#~ "si prosím, že v tomto případě nemůže být NFS svazek /usr chráněn pomocí "
+#~ "IPSec."
+
+#~ msgid ""
+#~ "If you use a PCMCIA network card for your IPSec connections, then you "
+#~ "only have to choose to start it after the PCMCIA services. Answer \"after "
+#~ "PCMCIA\" 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 ""
+#~ "Jestliže používáte PCMCIA síťovou kartu pro vaše IPSec připojení, pak je "
+#~ "jedinou možností jej spustit po PCMCIA službách. V tom případě odpovězte "
+#~ "„po PCMCIA“. Toto je také správná odpověď, pokud chcete získat klíče z "
+#~ "lokálního DNS serveru s podporou DNSSec."
+
+#~ msgid "Do you wish to restart strongSwan?"
+#~ msgstr "Přejete si restartovat strongSwan?"
+
+#~ msgid "Do you wish to support IKEv1?"
+#~ msgstr "Přejete si podporu IKEv1?"
+
+#~ 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 ""
+#~ "strongSwan podporuje protokol Internet Key Exchange ve verzích 1 a 2 "
+#~ "(IKEv1, IKEv2). Přejete si při startu strongSwanu spustit daemona „pluto“ "
+#~ "podporujícího IKEv1?"
+
+#~ msgid "Do you wish to support IKEv2?"
+#~ msgstr "Přejete si podporu IKEv2?"
+
+#~ 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 ""
+#~ "strongSwan podporuje protokol Internet Key Exchange ve verzích 1 a 2 "
+#~ "(IKEv1, IKEv2). Přejete si při startu strongSwanu spustit daemona "
+#~ "„charon“ podporujícího IKEv2?"
+
+#, fuzzy
+#~| msgid ""
+#~| "This installer can automatically create a RSA public/private keypair for "
+#~| "this host. This keypair can be used to authenticate IPSec connections to "
+#~| "other hosts and is the preferred way for building up secure IPSec "
+#~| "connections. The other possibility would be to use shared secrets "
+#~| "(passwords that are the same on both sides of the tunnel) for "
+#~| "authenticating an connection, but for a larger number of connections RSA "
+#~| "authentication is easier to administer and more secure."
+#~ msgid ""
+#~ "This installer can automatically create a RSA public/private keypair with "
+#~ "an X.509 certificate for this host. This can be used to authenticate  "
+#~ "IPSec connections to other hosts and is the preferred way for building "
+#~ "up  secure IPSec connections. The other possibility would be to use pre-"
+#~ "shared  secrets (PSKs, passwords that are the same on both sides of the "
+#~ "tunnel) for authenticating an connection, but for a larger number of "
+#~ "connections RSA authentication is easier to administer and more secure. "
+#~ "Note that having a keypair allows to use both X.509 and PSK "
+#~ "authentication for IPsec  tunnels."
+#~ msgstr ""
+#~ "Tento instalátor může automaticky vytvořit veřejný/soukromý pár RSA klíčů "
+#~ "pro tento počítač. Pár klíčů může být využit k autentizaci IPSec spojení "
+#~ "na další počítače a je upřednostňovanou cestou pro sestavování bezpečných "
+#~ "IPSec spojení. Další možností autentizace je využití sdílených tajemství "
+#~ "(hesel, která jsou stejná na obou stranách tunelu), ale pro větší počet "
+#~ "spojení je RSA autentizace snazší pro správu a mnohem bezpečnější."
+
+#~ msgid "The length of the created RSA key (in bits):"
+#~ msgstr "Délka vytvořeného RSA klíče (v bitech):"
+
+#~ 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."
+#~ msgstr ""
+#~ "Zadejte prosím délku vytvářeného RSA klíče. Kvůli bezpečnosti by neměla "
+#~ "být menší než 1024 bitů a pravděpodobně nepotřebujete víc než 2048 bitů, "
+#~ "protože to již zpomaluje proces autentizace."
+
+#, fuzzy
+#~| msgid ""
+#~| "This installer can only create self-signed X509 certificates "
+#~| "automatically, because otherwise a certificate authority is needed to "
+#~| "sign the certificate request. If you want to create a self-signed "
+#~| "certificate, you can use it immediately to connect to other IPSec hosts "
+#~| "that support X509 certificate for authentication of IPSec connections. "
+#~| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~| "you will need to have all X509 certificates signed by a single "
+#~| "certificate authority to create a trust path."
+#~ msgid ""
+#~ "This installer can only create self-signed X.509 certificates "
+#~ "automatically, because otherwise a certificate authority is needed to "
+#~ "sign the certificate request. If you want to create a self-signed "
+#~ "certificate, you can use it immediately to connect to other IPSec hosts "
+#~ "that support X.509 certificate for authentication of IPSec connections. "
+#~ "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~ "you will need to have all X.509 certificates signed by a single "
+#~ "certificate authority to create a trust path."
+#~ msgstr ""
+#~ "Tento instalátor může automaticky vytvořit pouze certifikát X509 "
+#~ "podepsaný sám sebou, jelikož v opačném případě je k podpisu certifikátu "
+#~ "potřeba certifikační autorita. Tento certifikát můžete ihned použít k "
+#~ "připojení na další počítače s IPSec, které podporují autentizaci pomocí "
+#~ "certifikátu X509. Nicméně chcete-li využít nových PKI možností "
+#~ "strongSwanu >= 1.91, budete k vytvoření důvěryhodných cest potřebovat "
+#~ "všechny certifikáty X509 podepsané jedinou certifikační autoritou."
+
+#~ 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 ""
+#~ "Je opravdu nutné, abyste vložili správný kód země, protože openssl jinak "
+#~ "odmítne vygenerování certifikátu. Prázdné pole je dovoleno ve všech "
+#~ "ostatních polích certifikátu X509 kromě tohoto."
+
+#~ msgid "Example: AT"
+#~ msgstr "Příklad: CZ"
+
+#~ msgid "Example: Upper Austria"
+#~ msgstr "Příklad: Morava"
+
+#~ msgid "Example: Vienna"
+#~ msgstr "Příklad: Olomouc"
+
+#, fuzzy
+#~| 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."
+#~ msgid ""
+#~ "Please enter the organization (e.g. company) that the X.509 certificate "
+#~ "should be created for. This name will be placed in the certificate "
+#~ "request."
+#~ msgstr ""
+#~ "Zadejte prosím organizaci pro kterou je certifikát vytvářen. Toto jméno "
+#~ "bude umístěno do požadavku na certifikát."
+
+#~ msgid "Example: Debian"
+#~ msgstr "Příklad: Debian"
+
+#~ msgid "Example: security group"
+#~ msgstr "Příklad: bezpečnostní oddělení"
+
+#~ msgid "Example: gateway.debian.org"
+#~ msgstr "Příklad: gateway.debian.org"
+
+#~ msgid ""
+#~ "strongSwan comes with support for opportunistic encryption (OE), which "
+#~ "stores IPSec authentication information (i.e. RSA public keys) in "
+#~ "(preferably secure) DNS records. Until this is widely deployed, "
+#~ "activating it will cause a significant slow-down for every new, outgoing "
+#~ "connection. Since version 2.0, strongSwan upstream comes with OE enabled "
+#~ "by default and is thus likely to break your existing connection to the "
+#~ "Internet (i.e. your default route) as soon as pluto (the strongSwan "
+#~ "keying daemon) is started."
+#~ msgstr ""
+#~ "strongSwan přichází s podporou pro oportunistické šifrování (OE), které "
+#~ "uchovává autentizační informace IPSecu (např. veřejné RSA klíče) v "
+#~ "(nejlépe zabezpečených) DNS záznamech. Dokud nebude tato schopnost více "
+#~ "rozšířena, způsobí její aktivace výrazné zpomalení každého nového "
+#~ "odchozího spojení. Od verze 2.0 přichází strongSwan s implicitně zapnutou "
+#~ "podporou OE čímž pravděpodobně zruší vaše probíhající spojení do "
+#~ "Internetu (tj. vaši výchozí cestu - default route) v okamžiku, kdy "
+#~ "spustíte pluto (strongSwan keying démon)."
+
+#~ msgid ""
+#~ "Please choose whether you want to enable support for OE. If unsure, do "
+#~ "not enable it."
+#~ msgstr ""
+#~ "Prosím vyberte si zda chcete povolit podporu pro OE. Nejste-li si jisti, "
+#~ "podporu nepovolujte."
 
 #~ msgid "x509, plain"
 #~ msgstr "x509, prostý"
diff --git a/debian/po/de.po b/debian/po/de.po
index fe7986935..61c226c0c 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: strongswan 4.1.4-1\n"
 "Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
 "PO-Revision-Date: 2007-07-08 12:01+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -16,91 +16,71 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "fr�hestm�glich, �nach NFS�, �nach PCMCIA�"
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
-msgstr "Wann soll strongSwan gestartet werden:"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
 msgstr ""
-"Es gibt drei M�glichkeiten, wann strongSwan starten kann: vor oder nach den "
-"NFS-Diensten und nach den PCMCIA-Diensten. Die richtige Antwort h�ngt von "
-"Ihrer spezifischen Einrichtung ab."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-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 "
-"�fr�hestm�glich� (Standardwert) auf diese Frage."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Wann soll strongSwan gestartet werden:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
-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."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 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."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
-msgstr "M�chten Sie strongSwan neustarten?"
+#: ../strongswan-starter.templates:3001
+#, fuzzy
+#| msgid "When to start strongSwan:"
+msgid "Restart strongSwan now?"
+msgstr "Wann soll strongSwan gestartet werden:"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Restarting strongSwan is a good idea, since if there is a security fix, "
+#| "it will not be fixed until the daemon restarts. Most people expect the "
+#| "daemon to restart, so this is generally a good idea. However this might "
+#| "take down existing connections and then bring them back up."
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
 "Es ist eine gute Idee, strongSwan neuzustarten, da eine Sicherheitskorrektur "
@@ -111,81 +91,62 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:3001
-msgid "Do you wish to support IKEv1?"
-msgstr "M�chten Sie IKEv1 unterst�tzen?"
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
-"strongSwan unterst�tzt beide Versionen des �Internet Key Exchange�-Protokolls "
-"(Schl�sselaustausch �ber Internet), IKEv1 und IKEv2. M�chten Sie den �pluto�-"
-"Daemon f�r IKEv1-Unterst�tzung starten, wenn strongSwan gestartet wird."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-msgid "Do you wish to support IKEv2?"
-msgstr "M�chten Sie IKEv2 unterst�tzen?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"strongSwan unterst�tzt beide Versionen des �Internet Key Exchange�-Protokolls "
-"(Schl�sselaustausch �ber Internet), IKEv1 und IKEv2. M�chten Sie den �charon�-"
-"Daemon f�r IKEv2-Unterst�tzung starten, wenn strongSwan gestartet wird."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-msgid "Do you want to create a RSA public/private keypair for this host?"
+msgid "Start strongSwan's IKEv2 daemon?"
 msgstr ""
-"M�chten Sie ein �ffentlich/privates RSA-Schl�sselpaar f�r diesen Rechner "
-"erstellen?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
 #, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
+#| msgid "Do you want to create a RSA public/private keypair for this host?"
+msgid "Create an RSA public/private keypair for this host?"
+msgstr ""
+"M�chten Sie ein �ffentlich/privates RSA-Schl�sselpaar f�r diesen Rechner "
+"erstellen?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
-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."
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter.templates:6001
 #, fuzzy
 #| msgid ""
 #| "If you do not want to create a new public/private keypair, you can choose "
@@ -199,15 +160,15 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
 #| msgid "Do you have an existing X509 certificate file for strongSwan?"
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid "Use an existing X.509 certificate for strongSwan?"
 msgstr "Verf�gen Sie �ber ein existierendes X509-Zertifikat f�r strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
 #| msgid ""
 #| "This installer can automatically extract the needed information from an "
@@ -216,11 +177,11 @@ msgstr "Verf�gen Sie �ber ein existierendes X509-Zertifikat f�r strongSwan?"
 #| "certificate and key file and want to use it for authenticating IPSec "
 #| "connections, then please answer yes."
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
 "Dieses Installationsprogramm kann automatisch die ben�tigten Informationen "
 "aus einem existierenden X509-Zertifikat mit passendem privatem RSA-Schl�ssel "
@@ -231,7 +192,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter.templates:8001
 #, fuzzy
 #| msgid "File name of your X509 certificate in PEM format:"
 msgid "File name of your X.509 certificate in PEM format:"
@@ -239,7 +200,7 @@ msgstr "Dateiname Ihres X509-Zertifikates im PEM-Format:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter.templates:8001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing your X509 "
@@ -253,15 +214,15 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
 #| msgid "File name of your X509 private key in PEM format:"
-msgid "File name of your X.509 private key in PEM format:"
+msgid "File name of your existing X.509 private key in PEM format:"
 msgstr "Dateiname Ihres privaten X509-Schl�ssels im PEM-Format:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing the private RSA key "
@@ -269,8 +230,8 @@ msgstr "Dateiname Ihres privaten X509-Schl�ssels im PEM-Format:"
 #| "that contains the X509 certificate."
 msgid ""
 "Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
 "Bitte geben Sie den kompletten Ort der Datei an, die den privaten RSA-"
 "Schl�ssel enth�lt, der zu Ihrem X509-Zertifikat im PEM-Format passt. Dies "
@@ -278,72 +239,58 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
-msgstr "Die L�nge des erstellten RSA-Schl�ssels (in Bits):"
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter.templates:10001
 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."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"Bitte geben Sie die L�nge des erstellten RSA-Schl�ssels an. Er sollte nicht "
-"k�rzer als 1024 Bits sein, da dies als unsicher betrachtet werden k�nnte und "
-"Sie ben�tigen nicht mehr als 2048 Bits, da dies nur den Authentifizierungs-"
-"Prozess verlangsamt und derzeit nicht ben�tigt wird."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
 #, fuzzy
 #| msgid "Do you want to create a self-signed X509 certificate?"
-msgid "Do you want to create a self-signed X.509 certificate?"
+msgid "Create a self-signed X.509 certificate?"
 msgstr "M�chten Sie ein selbst-signiertes X509-Zertifikat erstellen?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid ""
-#| "This installer can only create self-signed X509 certificates "
-#| "automatically, because otherwise a certificate authority is needed to "
-#| "sign the certificate request. If you want to create a self-signed "
-#| "certificate, you can use it immediately to connect to other IPSec hosts "
-#| "that support X509 certificate for authentication of IPSec connections. "
-#| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
-#| "you will need to have all X509 certificates signed by a single "
-#| "certificate authority to create a trust path."
+#: ../strongswan-starter.templates:11001
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"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."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
 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 get the certificate request signed by your certificate "
-"authority."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates: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 get the certificate request signed by your "
+#| "certificate authority."
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
 msgstr ""
 "Falls Sie kein selbst-signiertes Zertifikat erstellen m�chten, wird dieses "
 "Installationsprogramm nur einen privaten RSA-Schl�ssel und die "
@@ -352,7 +299,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter.templates:12001
 #, fuzzy
 #| msgid "Country code for the X509 certificate request:"
 msgid "Country code for the X.509 certificate request:"
@@ -360,35 +307,27 @@ msgstr "L�ndercode f�r die X509-Zertifizierungsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter.templates:12001
+#, fuzzy
+#| msgid ""
+#| "Please enter the 2 letter country code for your country. This code will "
+#| "be placed in the certificate request."
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
 "Bitte geben Sie den zweibuchstabigen L�ndercode f�r Ihr Land ein. Dieser "
 "Code wird in der Zertifikatsanfrage verwendet."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
-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."
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
 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 "
-"X509-Zertifikat darf leer bleiben; dieses aber nicht."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Beispiel: AT"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter.templates:13001
 #, fuzzy
 #| msgid "State or province name for the X509 certificate request:"
 msgid "State or province name for the X.509 certificate request:"
@@ -396,23 +335,21 @@ msgstr "Name des Landes oder der Provinz f�r diese X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter.templates:13001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full name of the state or province you live in. This "
+#| "name will be placed in the certificate request."
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
 "Bitte geben Sie den kompletten Namen des Landes oder der Provinz ein, in der "
 "Sie leben. Dieser Name wird in der Zertifikatsanfrage verwendet."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "Beispiel: Ober�sterreich"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter.templates:14001
 #, fuzzy
 #| msgid "Locality name for the X509 certificate request:"
 msgid "Locality name for the X.509 certificate request:"
@@ -420,23 +357,21 @@ msgstr "�rtlichkeitsangabe f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter.templates:14001
+#, fuzzy
+#| msgid ""
+#| "Please enter the locality (e.g. city) where you live. This name will be "
+#| "placed in the certificate request."
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
 "Bitte geben Sie die �rtlichkeit (z.B. Stadt) ein, in der Sie leben. Dieser "
 "Name wird in der Zertifikatsanfrage verwandt."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Beispiel: Wien"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter.templates:15001
 #, fuzzy
 #| msgid "Organization name for the X509 certificate request:"
 msgid "Organization name for the X.509 certificate request:"
@@ -444,29 +379,23 @@ msgstr "Organisationsname f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter.templates:15001
 #, fuzzy
 #| 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."
+#| "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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Bitte geben Sie die Organisation (z.B. Firma) ein, f�r die das X509-"
-"Zertifikat erstellt werden soll. Dieser Name wird in der Zertifikatsanfrage "
-"verwandt."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Beispiel: Debian"
+"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-starter.templates:15001
+#: ../strongswan-starter.templates:16001
 #, fuzzy
 #| msgid "Organizational unit for the X509 certificate request:"
 msgid "Organizational unit for the X.509 certificate request:"
@@ -474,16 +403,15 @@ msgstr "Organisationseinheit f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter.templates:16001
 #, fuzzy
 #| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used 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 "
@@ -491,13 +419,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Beispiel: Sicherheitsgruppe"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter.templates:17001
 #, fuzzy
 #| msgid "Common name for the X509 certificate request:"
 msgid "Common name for the X.509 certificate request:"
@@ -505,16 +427,15 @@ msgstr "Allgemeiner Name f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter.templates:17001
 #, fuzzy
 #| 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."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the common name (such as the host name of this machine) that "
+"should be used 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 "
@@ -522,13 +443,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Beispiel: gateway.debian.org"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 #, fuzzy
 #| msgid "Email address for the X509 certificate request:"
 msgid "Email address for the X.509 certificate request:"
@@ -536,16 +451,15 @@ msgstr "E-Mail-Adresse f�r die X509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 #, fuzzy
 #| 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 "
 #| "certificate request."
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
 "Bitte geben Sie die E-Mail-Adresse der Person oder Organisation ein, die f�r "
 "das X509-Zertifikat verantwortlich ist. Diese Adresse wird in der "
@@ -553,40 +467,254 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+#: ../strongswan-starter.templates:19001
+#, fuzzy
+#| msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+msgid "Enable opportunistic encryption?"
 msgstr "M�chten Sie opportunistische Verschl�sselung in strongSwan aktivieren?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
-msgstr ""
-"strongSwan enth�lt Unterst�tzung f�r opportunistische Verschl�sselung (OV), "
-"die Authentifizierungsinformationen von IPSec (z.B. �ffentliche RSA-"
-"Schl�ssel) in DNS-Datens�tzen speichert. Solange dies nicht weit verbreitet "
-"ist, wird jede neue ausgehende Verbindung signifikant verlangsamt, falls "
-"diese Option aktiviert ist. Seit Version 2.0 wird strongSwan von den Autoren "
-"mit aktiviertem OV ausgeliefert und wird daher wahrscheinlich Ihre "
-"existierenden Verbindungen ins Internet (d.h. Ihre Standard-Route) st�ren, "
-"sobald Pluto (der strongSwan Schl�ssel-Daemon) gestartet wird."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"Bitte w�hlen Sie aus, ob Sie OV aktivieren m�chten. Falls Sie unsicher sind, "
-"aktivieren Sie es nicht."
+
+#~ msgid "earliest, \"after NFS\", \"after PCMCIA\""
+#~ msgstr "fr�hestm�glich, �nach NFS�, �nach PCMCIA�"
+
+#~ msgid ""
+#~ "There are three possibilities when strongSwan can start: before or after "
+#~ "the NFS services and after the PCMCIA services. The correct answer "
+#~ "depends on your specific setup."
+#~ msgstr ""
+#~ "Es gibt drei M�glichkeiten, wann strongSwan starten kann: vor oder nach "
+#~ "den NFS-Diensten und nach den PCMCIA-Diensten. Die richtige Antwort h�ngt "
+#~ "von Ihrer spezifischen Einrichtung ab."
+
+#~ msgid ""
+#~ "If you do not have your /usr tree mounted via NFS (either you only mount "
+#~ "other, less vital trees via NFS or don't use NFS mounted trees at all) "
+#~ "and don't use a PCMCIA network card, then it's best to start strongSwan "
+#~ "at the earliest possible time, thus allowing the NFS mounts to be secured "
+#~ "by IPSec. In this case (or if you don't understand or care about this "
+#~ "issue), answer \"earliest\" to this question (the default)."
+#~ 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 �fr�hestm�glich� (Standardwert) auf diese Frage."
+
+#~ msgid ""
+#~ "If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
+#~ "card, then you will need to start strongSwan after NFS so that all "
+#~ "necessary files are available. In this case, answer \"after NFS\" to this "
+#~ "question. Please note that the NFS mount of /usr can not be secured by "
+#~ "IPSec in this case."
+#~ 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."
+
+#~ msgid ""
+#~ "If you use a PCMCIA network card for your IPSec connections, then you "
+#~ "only have to choose to start it after the PCMCIA services. Answer \"after "
+#~ "PCMCIA\" 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 ""
+#~ "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."
+
+#~ msgid "Do you wish to restart strongSwan?"
+#~ msgstr "M�chten Sie strongSwan neustarten?"
+
+#~ msgid "Do you wish to support IKEv1?"
+#~ msgstr "M�chten Sie IKEv1 unterst�tzen?"
+
+#~ 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 ""
+#~ "strongSwan unterst�tzt beide Versionen des �Internet Key Exchange�-"
+#~ "Protokolls (Schl�sselaustausch �ber Internet), IKEv1 und IKEv2. M�chten "
+#~ "Sie den �pluto�-Daemon f�r IKEv1-Unterst�tzung starten, wenn strongSwan "
+#~ "gestartet wird."
+
+#~ msgid "Do you wish to support IKEv2?"
+#~ msgstr "M�chten Sie IKEv2 unterst�tzen?"
+
+#~ 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 ""
+#~ "strongSwan unterst�tzt beide Versionen des �Internet Key Exchange�-"
+#~ "Protokolls (Schl�sselaustausch �ber Internet), IKEv1 und IKEv2. M�chten "
+#~ "Sie den �charon�-Daemon f�r IKEv2-Unterst�tzung starten, wenn strongSwan "
+#~ "gestartet wird."
+
+#, fuzzy
+#~| msgid ""
+#~| "This installer can automatically create a RSA public/private keypair for "
+#~| "this host. This keypair can be used to authenticate IPSec connections to "
+#~| "other hosts and is the preferred way for building up secure IPSec "
+#~| "connections. The other possibility would be to use shared secrets "
+#~| "(passwords that are the same on both sides of the tunnel) for "
+#~| "authenticating an connection, but for a larger number of connections RSA "
+#~| "authentication is easier to administer and more secure."
+#~ msgid ""
+#~ "This installer can automatically create a RSA public/private keypair with "
+#~ "an X.509 certificate for this host. This can be used to authenticate  "
+#~ "IPSec connections to other hosts and is the preferred way for building "
+#~ "up  secure IPSec connections. The other possibility would be to use pre-"
+#~ "shared  secrets (PSKs, passwords that are the same on both sides of the "
+#~ "tunnel) for authenticating an connection, but for a larger number of "
+#~ "connections RSA authentication is easier to administer and more secure. "
+#~ "Note that having a keypair allows to use both X.509 and PSK "
+#~ "authentication for IPsec  tunnels."
+#~ 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."
+
+#~ msgid "The length of the created RSA key (in bits):"
+#~ msgstr "Die L�nge des erstellten RSA-Schl�ssels (in Bits):"
+
+#~ 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."
+#~ msgstr ""
+#~ "Bitte geben Sie die L�nge des erstellten RSA-Schl�ssels an. Er sollte "
+#~ "nicht k�rzer als 1024 Bits sein, da dies als unsicher betrachtet werden "
+#~ "k�nnte und Sie ben�tigen nicht mehr als 2048 Bits, da dies nur den "
+#~ "Authentifizierungs-Prozess verlangsamt und derzeit nicht ben�tigt wird."
+
+#, fuzzy
+#~| msgid ""
+#~| "This installer can only create self-signed X509 certificates "
+#~| "automatically, because otherwise a certificate authority is needed to "
+#~| "sign the certificate request. If you want to create a self-signed "
+#~| "certificate, you can use it immediately to connect to other IPSec hosts "
+#~| "that support X509 certificate for authentication of IPSec connections. "
+#~| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~| "you will need to have all X509 certificates signed by a single "
+#~| "certificate authority to create a trust path."
+#~ msgid ""
+#~ "This installer can only create self-signed X.509 certificates "
+#~ "automatically, because otherwise a certificate authority is needed to "
+#~ "sign the certificate request. If you want to create a self-signed "
+#~ "certificate, you can use it immediately to connect to other IPSec hosts "
+#~ "that support X.509 certificate for authentication of IPSec connections. "
+#~ "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~ "you will need to have all X.509 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."
+
+#~ 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 X509-Zertifikat darf leer bleiben; dieses aber nicht."
+
+#~ msgid "Example: AT"
+#~ msgstr "Beispiel: AT"
+
+#~ msgid "Example: Upper Austria"
+#~ msgstr "Beispiel: Ober�sterreich"
+
+#~ msgid "Example: Vienna"
+#~ msgstr "Beispiel: Wien"
+
+#, fuzzy
+#~| 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."
+#~ msgid ""
+#~ "Please enter the organization (e.g. company) that the X.509 certificate "
+#~ "should be created for. This name will be placed in the certificate "
+#~ "request."
+#~ msgstr ""
+#~ "Bitte geben Sie die Organisation (z.B. Firma) ein, f�r die das X509-"
+#~ "Zertifikat erstellt werden soll. Dieser Name wird in der "
+#~ "Zertifikatsanfrage verwandt."
+
+#~ msgid "Example: Debian"
+#~ msgstr "Beispiel: Debian"
+
+#~ msgid "Example: security group"
+#~ msgstr "Beispiel: Sicherheitsgruppe"
+
+#~ msgid "Example: gateway.debian.org"
+#~ msgstr "Beispiel: gateway.debian.org"
+
+#~ msgid ""
+#~ "strongSwan comes with support for opportunistic encryption (OE), which "
+#~ "stores IPSec authentication information (i.e. RSA public keys) in "
+#~ "(preferably secure) DNS records. Until this is widely deployed, "
+#~ "activating it will cause a significant slow-down for every new, outgoing "
+#~ "connection. Since version 2.0, strongSwan upstream comes with OE enabled "
+#~ "by default and is thus likely to break your existing connection to the "
+#~ "Internet (i.e. your default route) as soon as pluto (the strongSwan "
+#~ "keying daemon) is started."
+#~ msgstr ""
+#~ "strongSwan enth�lt Unterst�tzung f�r opportunistische Verschl�sselung "
+#~ "(OV), die Authentifizierungsinformationen von IPSec (z.B. �ffentliche RSA-"
+#~ "Schl�ssel) in DNS-Datens�tzen speichert. Solange dies nicht weit "
+#~ "verbreitet ist, wird jede neue ausgehende Verbindung signifikant "
+#~ "verlangsamt, falls diese Option aktiviert ist. Seit Version 2.0 wird "
+#~ "strongSwan von den Autoren mit aktiviertem OV ausgeliefert und wird daher "
+#~ "wahrscheinlich Ihre existierenden Verbindungen ins Internet (d.h. Ihre "
+#~ "Standard-Route) st�ren, sobald Pluto (der strongSwan Schl�ssel-Daemon) "
+#~ "gestartet wird."
+
+#~ msgid ""
+#~ "Please choose whether you want to enable support for OE. If unsure, do "
+#~ "not enable it."
+#~ msgstr ""
+#~ "Bitte w�hlen Sie aus, ob Sie OV aktivieren m�chten. Falls Sie unsicher "
+#~ "sind, aktivieren Sie es nicht."
 
 #~ msgid "x509, plain"
 #~ msgstr "x509, einfach"
diff --git a/debian/po/eu.po b/debian/po/eu.po
new file mode 100644
index 000000000..b2b88433e
--- /dev/null
+++ b/debian/po/eu.po
@@ -0,0 +1,467 @@
+# translation of eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi@beobide.net>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-21 11:16+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "abioan"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "NFS ondoren"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "PCMCIA ondoren"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "StrongSwan abiaraztean:"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
+"StrongSwan sistema abioan abiarazten da horrela automatikoki muntatzen diren "
+"fitxategi-sistemak babesteko."
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
+msgstr ""
+" * abioan: /usr ez badago NFS bidez muntaturik eta PCMCIA sare txartelik\n"
+"   erabiltzen ez baduzu, hobe da strongSwan ahalik eta azkarren\n"
+"   abiaraztea, horrela NFS muntatzeak IPSec bidez babestu daitezke;\n"
+" * NFS ondoren: /usr NFS bidez muntaturik dagoenean eta PCMCIA\n"
+"   sare txartelik erabiltzen ez bada gomendagarria;\n"
+" * PCMCIA ondoren: IPSec konexioak PCMCIA sare txartela bat erabiltzean\n"
+"   edo gakoak DNSSec onartzen duen DNS zerbitzari lkokaletik eskuratu behar "
+"direnean\n"
+"   gomendagarria."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "StrongSwan orain berrabiarazi?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid ""
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
+"existing connections and then bring them back up."
+msgstr ""
+"StrongSwan berrabiaraztea gomendagarria da segurtasun konpontze bat badago "
+"ez bait da ezarriko deabrua berrabiarazi artean. Hala ere, honek martxan "
+"dauden konexioak itxi eta gero berriz abiaraziko ditu."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If you don't restart strongSwan now, you should do so manually at the "
+#| "first  opportunity."
+msgid ""
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
+msgstr ""
+"Ez baduzu strongSwan orain berrabiarazten, eskuz egin beharko zenuke ahal "
+"bezain laster."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "StrongSwan-ren IKEv1 deabrua abiarazi?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid ""
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Pluto deabrua martxan egon behar da Internet gako trukatze (IKE) "
+"protokoloaren lehen bertsioa onartzeko."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "StrongSwan-ren IKEv2 deabrua abiarazi?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Charon deabrua martxan egon behar da Internet gako trukatze (IKE) "
+"protokoloaren lehen bertsioa onartzeko."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Sortu RSA publiko/pribatu gako pare bat ostalari honentzako?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
+"StrongSwan-ek Pre-Shared Key (PSK) edo RSA gako-parea erabil dezake beste "
+"ostalariekiko IPSec konexioak autentifikatzeko. RSA autentifikazioa "
+"arruntean seguruago da eta errazago kudeatzen da. PSK eta RSA "
+"autentifikazioak batera erabili ditzakezu."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
+msgstr ""
+"Ez baduzu gako-pare publiko/pribatu berririk sortu nahi. dagoeneko sorturik "
+"dagoen bat hautatu dezakezu hurrengo urratsean."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "DAgoen X.509 ziurtagiria erabili strongSwan-rentzat?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid ""
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
+msgstr ""
+"Beharrezko informazioa automatikoki dagoen dagokion RSA gako pribatuaz X.509 "
+"ziurtagiritik atera daiteke. Bi zatiak fitxategi bakar batean egon daitezke, "
+"PEM formatuan badago. Aukera hau hautatu beharko zenuke dagoeneko "
+"ziurtagirik eta gako fitxategia badituzu eta IPSec konexioen "
+"autentifikaziorako erabili nahi badituzu."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "X.509 ziurtagiriaren fitxategi-izena PEM formatuan:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid ""
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
+msgstr ""
+"Mesedez idatzi zure X.509 ziurtagiria duen fitxategiaren kokapen osoa PEM "
+"formatuan."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "X.509 gako pribatuaren fitxategi-izena PEM formatuan:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid ""
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
+msgstr ""
+"Mesedez idatzi zure X.509 ziurtagiriaren pareko RSA gako pribatua duen "
+"fitxategiaren kokapen osoa PEM formatuan. Hau X.509 ziurtagiriaren berdina "
+"izan daiteke."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr "RSA gako luzapena:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+#, fuzzy
+#| msgid ""
+#| "Please enter the length of RSA key you wish to generate. A value of less "
+#| "than  1024 bits is not considered secure. A value of more than 2048 bits "
+#| "will  probably affect performance."
+msgid ""
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
+msgstr ""
+"Mesedez zehaztu sortu nahi duzun RSA gakoaren luzapena. 1024 bit-etik "
+"beherako balioak ez dira segurutzat ematen. 2048 bit-tik gorako balioek "
+"ziurrenik performantzian eragingo dute."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Sortu auto-sinatutako X.509  ziurtagiria?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
+"Auto-sinatutako X.509 ziurtagiriak bakarrik sor daitezke automatikoki, beste "
+"modu batetara ziurtagiri autoritate batek ziurtagiri eskaera sinatzea behar "
+"da eta."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+#, fuzzy
+#| msgid "Common name for the X.509 certificate request:"
+msgid "Country code for the X.509 certificate request:"
+msgstr "X.509 ziurtagiri eskaerarako izen arrunta:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+#, fuzzy
+#| msgid ""
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
+msgid ""
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
+msgstr ""
+"Mesedez idatzi organizazio unitate izena (ziurrenik departamentua) "
+"ziurtagiri eskaeran erabili ahal izateko."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+#, fuzzy
+#| msgid "Common name for the X.509 certificate request:"
+msgid "State or province name for the X.509 certificate request:"
+msgstr "X.509 ziurtagiri eskaerarako izen arrunta:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+#, fuzzy
+#| msgid ""
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
+msgid ""
+"Please enter the full name of the state or province to include in the "
+"certificate request."
+msgstr ""
+"Mesedez idatzi organizazio unitate izena (ziurrenik departamentua) "
+"ziurtagiri eskaeran erabili ahal izateko."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+#, fuzzy
+#| msgid "Common name for the X.509 certificate request:"
+msgid "Locality name for the X.509 certificate request:"
+msgstr "X.509 ziurtagiri eskaerarako izen arrunta:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+#, fuzzy
+#| msgid ""
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
+msgid ""
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
+msgstr ""
+"Mesedez idatzi organizazio unitate izena (ziurrenik departamentua) "
+"ziurtagiri eskaeran erabili ahal izateko."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+#, fuzzy
+#| msgid "Organizational unit for the X.509 certificate request:"
+msgid "Organization name for the X.509 certificate request:"
+msgstr "X.509 ziurtagiri eskaerarako organizazio unitatea:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+#, fuzzy
+#| msgid ""
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
+msgid ""
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
+msgstr ""
+"Mesedez idatzi organizazio unitate izena (ziurrenik departamentua) "
+"ziurtagiri eskaeran erabili ahal izateko."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "X.509 ziurtagiri eskaerarako organizazio unitatea:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+#, fuzzy
+#| msgid ""
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
+msgid ""
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
+msgstr ""
+"Mesedez idatzi organizazio unitate izena (ziurrenik departamentua) "
+"ziurtagiri eskaeran erabili ahal izateko."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "X.509 ziurtagiri eskaerarako izen arrunta:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Mesedez idatzi ziurtagiri eskaeran erabili behar den izen arrunta (makina "
+"honen ostalari izena bezalakoa)."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid "Email address for the X.509 certificate request:"
+msgstr "X.509 ziurtagiri eskaerarako eposta helbidea:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid ""
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
+msgstr ""
+"Mesedez idatzi ziurtagiri eskaeran erabili behar den eposta helbidea "
+"(banakako edo erakunde buruarena)."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Aukerako enkriptazioa gaitu?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
+"StrongSwan bertsio honek aukerako enkriptatze (opportunistic encryption, OE) "
+"euskarria du, honek IPSec autentifikazio informazioa DNS erregistroetan "
+"gordetzen ditu. Hau guztiz garatua ez dagoenez gaitzeak kanporako konexio "
+"berri guztien atzerapen esanguratsu bat eragin dezake."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
+msgstr ""
+"Aukerako enkriptatzea behar duzula ziur bazaude bakarrik gaitu beharko "
+"zenuke. Internet konexioak moztuko dira (lehenetsitako atebidea) pluto "
+"deabrua abiaraztean."
+
+#~ msgid "Please enter the organization name (often a company)"
+#~ msgstr "Mesedez idatzi organizazio izena (ziurrenik konpainia)"
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 000000000..925ceb68f
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,427 @@
+# Copyright (C) 2009
+# This file is distributed under the same license as the strongswan package.
+#
+# Esko Arajärvi <edu@iki.fi>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: strongswan\n"
+"Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 14:49+0100\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "mahdollisimman aikaisin"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "NFS:n jälkeen"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "PCMCIA:n jälkeen"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Koska strongSwan käynnistetään:"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
+"StrongSwan käynnistetään järjestelmän käynnistyessä, jotta se voi suojella "
+"automaattisesti liitettäviä levyjärjestelmiä."
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
+msgstr ""
+"* mahdollisimman aikaisin: Jos hakemistoa /usr ei liitetä NFS:n avulla,\n"
+"  eikä käytössä ole PCMCIA-verkkokortteja, strongSwan kannattaa\n"
+"  käynnistää mahdollisimman aikaisin, jotta liitettävät NFS-järjestelmät\n"
+"  voidaan suojata IPSecillä.\n"
+"* NFS:n jälkeen: suositeltava, kun käytössä ei ole PCMCIA-verkkokortteja\n"
+"  ja /usr liitetään NFS:n avulla.\n"
+"* PCMCIA:n jälkeen: suositeltava, jos IPSec-yhteys käyttää\n"
+"  PCMCIA-verkkokorttia tai hakee avaimia paikalliselta DNS-palvelimelta\n"
+"  DNSSec-tuen avulla."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Käynnistetäänkö strongSwan uudelleen nyt?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid ""
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
+"existing connections and then bring them back up."
+msgstr ""
+"On suositeltavaa käynnistää strongSwan-taustaohjelma uudelleen, koska "
+"mahdolliset tietoturvapäivitykset eivät tule käyttöön ennen tätä. Tämä "
+"saattaa kuitenkin katkaista olemassa olevat yhteydet ja avata ne sitten "
+"uudelleen."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid ""
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
+msgstr ""
+"Jos et käynnistä strongSwania nyt uudelleen, tee se käsin mahdollisimman "
+"pian."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Käynnistetäänkö strongSwanin IKEv1-taustaohjelma?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid ""
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Internet Key Exchange -protokollan version 1 tuki vaatii, että pluto-"
+"taustaohjelma on käynnissä."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Käynnistetäänkö strongSwanin IKEv2-taustaohjelma?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Internet Key Exchange -protokollan version 2 tuki vaatii, että charon-"
+"taustaohjelma on käynnissä."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr ""
+"Luodaanko tälle koneelle julkisesta ja salaisesta avaimesta koostuva RSA-"
+"avainpari?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
+"StrongSwan voi käyttää ennalta vaihdettua avainta (Pre-Shared Key, PSK) tai "
+"RSA-avainparia varmentaessaan IPSec-yhteyksiä toisiin koneisiin. RSA-"
+"varmennusta pidetään yleisesti turvallisempana ja helpommin ylläpidettävänä. "
+"PSK- ja RSA-varmennuksia voidaan käyttää yhtä aikaa."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
+msgstr ""
+"Jos et halua luoda uutta avainparia, voi valita olemassa olevan parin "
+"seuraavassa vaiheessa."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Tulisiko strongSwanin käyttää olemassa olevaa X.509-varmennetiedostoa?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid ""
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
+msgstr ""
+"Vaadittavat tiedot voidaan automaattisesti erottaa olemassa olevasta X.509-"
+"varmennetiedostosta täsmäävällä salaisella RSA-avaimella. Avaimen molemmat "
+"osat voivat olla samassa tiedostossa, jos se on PEM-muodossa. Valitse tämä "
+"vaihtoehto, jos tällaiset varmenne- ja avaintiedostot ovat olemassa ja "
+"haluat käyttää niitä IPSec-yhteyksien varmentamiseen."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "PEM-muodossa olevan X.509-varmennetiedoston nimi:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid ""
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
+msgstr ""
+"Anna PEM-muodossa olevan, X.509-varmenteen sisältävän tiedoston täydellinen "
+"polku."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "PEM-muotoisen, olemassa olevan, salaisen X.509-avaimen tiedostonimi:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid ""
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
+msgstr ""
+"Anna PEM-muodossa olevaan X.509-varmenteeseen täsmäävän salaisen RSA-avaimen "
+"täydellinen polku. Tämä voi olla sama tiedosto kuin X.509-varmenteen "
+"sisältävä."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr "RSA-avaimen pituus:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+msgid ""
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
+msgstr ""
+"Anna luotavan RSA-avaimen pituus. 1024 bittiä lyhyempiä avaimia ei pidetä "
+"turvallisina. 2048 bittiä pidemmät avaimet luultavasti heikentävät "
+"suorituskykyä."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Luodaanko itseallekirjoitettu X.509-varmenne?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
+"Vain itseallekirjoitettu X.509-varmenne voidaan luoda automaattisesti, koska "
+"muussa tapauksessa tarvitaan ulkoinen varmentaja allekirjoittamaan "
+"varmennepyyntö."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+"Jos valitset tämän vaihtoehdon, luotua varmennetta voidaan heti käyttää "
+"yhteyksien ottamiseen toisiin IPSEc-koneisiin, jotka tukevat varmentamista "
+"X.509-varmenteilla. StrongSwanin PKI-ominaisuuksien käyttö kuitenkin vaatii "
+"varmennuspolun, jossa sama varmentaja on allekirjoittanut kaikki X.509-"
+"varmenteet."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Jos et valitse tätä vaihtoehtoa, luodaan vain salainen RSA-avain ja "
+"varmennepyyntö, joka pitää lähettää ulkoisen varmentajan "
+"allekirjoitettavaksi."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "Country code for the X.509 certificate request:"
+msgstr "X.509-varmennepyynnön maakoodi:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid ""
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
+msgstr "Anna varmennepyynnössä käytettävä kaksikirjaiminen ISO-3166-maakoodi."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr "Tämä kenttä on pakollinen. Ilman sitä varmennetta ei voida luoda."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid "State or province name for the X.509 certificate request:"
+msgstr "X.509-varmennepyynnön osavaltio, lääni tai maakunta:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid ""
+"Please enter the full name of the state or province to include in the "
+"certificate request."
+msgstr ""
+"Anna varmennepyyntöön sisällytettävä osavaltion, läänin tai maakunnan koko "
+"nimi."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid "Locality name for the X.509 certificate request:"
+msgstr "X.509-varmennepyynnön paikkakunta:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid ""
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
+msgstr "Anna varmennepyynnössä käytettävä paikkakunnan nimi (usein kaupunki)."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid "Organization name for the X.509 certificate request:"
+msgstr "X.509-varmennepyynnön järjestön nimi:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid ""
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
+msgstr "Anna varmennepyynnössä käytettävä järjestön nimi (usein yritys)."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "X.509-varmennepyynnön järjestön yksikkö:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+msgid ""
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
+msgstr "Valitse varmennepyynnössä käytettävä järjestön yksikkö (usein osasto)."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "X.509-varmennepyynnön yleinen nimi:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Anna varmennepyynnössä käytettävä yleinen nimi (kuten tämän koneen "
+"verkkonimi)."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid "Email address for the X.509 certificate request:"
+msgstr "X.509-varmennepyynnön sähköpostiosoite:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid ""
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
+msgstr ""
+"Anna varmennepyynnössä käytettävä sähköpostiosoite (yksityinen ja järjestön)."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Käytetäänkö opportunistista salausta?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
+"StrongSwanin tämä versio tukee opportunistista salausta (opportunistic "
+"encryption, OE), joka tallentaa IPSec-varmennustietoja DNS-tietueisiin. "
+"Ennen kuin tämä käytäntö yleistyy laajalti, sen käyttö aiheuttaa merkittävän "
+"viiveen jokaiseen uuteen ulospäin otettavaan yhteyteen."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
+msgstr ""
+"Valitse opportunistinen salaus vain, jos olet varma, että haluat sen "
+"käyttöön. Se saattaa rikkoa Internet-yhteyden (oletusreitityksen), kun pluto-"
+"taustaohjelma käynnistyy."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index a0cd51baa..556d171aa 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -2,640 +2,435 @@
 # Copyright (C) 2005-2007 Christian Perrier <bubulle@debian.org>
 # This file is distributed under the same license as the strongswan package.
 #
-# Christian Perrier <bubulle@debian.org>, 2005-2007.
+# Christian Perrier <bubulle@debian.org>, 2005-2007, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: strongswan\n"
 "Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
-"PO-Revision-Date: 2007-07-05 07:28+0200\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 14:50+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "Le plus tôt possible, Après NFS, Après PCMCIA"
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "Le plus tôt possible"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
-msgstr "Moment de démarrage de strongSwan :"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "Après NFS"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
-msgstr ""
-"Il existe trois moments où il est opportun de démarrer strongSwan : avant ou "
-"après les services NFS, ou après les services PCMCIA. La réponse appropriée "
-"dépend de vos réglages spécifiques."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "Après PCMCIA"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"Si votre arborescence /usr n'est pas un montage NFS (soit parce que vos "
-"montages NFS sont à d'autres endroits, moins critiques, soit parce que vous "
-"n'utilisez pas du tout de montage NFS) et si vous n'utilisez pas de carte "
-"réseau PCMCIA, il est préférable de démarrer strongSwan le plus tôt "
-"possible, ce qui permettra de sécuriser les montages NFS avec IPSec. Dans ce "
-"cas (ou bien si vous ne comprenez pas l'objet de la question ou qu'elle ne "
-"vous concerne pas), choisissez « le plus tôt possible », qui est le choix par "
-"défaut."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Moment de démarrage de strongSwan :"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
 msgstr ""
-"Si /usr est un montage NFS et que vous n'utilisez pas de carte réseau "
-"PCMCIA, vous devrez alors démarrer strongSwan après les services NFS afin "
-"que tous les fichiers nécessaires soient disponibles. Dans ce cas, "
-"choisissez « Après NFS ». Veuillez noter que le montage NFS de /usr n'est "
-"alors pas sécurisé par IPSec."
+"StrongSwan est lancé au démarrage du système afin de pouvoir protéger les "
+"systèmes de fichiers qui sont montés automatiquement."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
-"Si vous utilisez une carte PCMCIA pour vos connexions IPSec, votre seul "
-"choix possible est le démarrage après les services PCMCIA. Choisissez alors "
-"« Après PCMCIA ». Faites également ce choix si vous souhaitez récupérer les "
-"clés d'authentification sur un serveur DNS reconnaissant DNSSec."
+" - Le plus tôt possible : conseillé si /usr n'est pas monté par NFS\n"
+"   et que vous n'utilisez pas de carte réseau PCMCIA ;\n"
+" - Après NFS : recommandé si /usr est un montage NFS et qu'aucune\n"
+"   carte réseau PCMCIA n'est utilisée ;\n"
+" - après PCMCIA : recommandé si la connexion IPSec utilise une carte\n"
+"   réseau PCMCIA ou s'il est nécessaire de récupérer des clés\n"
+"   depuis un serveur DNS qui gère DNSSec."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
-msgstr "Souhaitez-vous redémarrer strongSwan ?"
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Faut-il redémarrer StrongSwan maintenant ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
 "Redémarrer strongSwan est préférable car un éventuel correctif de sécurité "
-"ne prendra effet que si le démon est redémarré. La plupart des utilisateurs "
-"s'attendent à ce que le démon redémarre et c'est donc le plus souvent le "
-"meilleur choix. Cependant, cela pourrait interrompre provisoirement des "
-"connexions en cours."
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates:3001
-msgid "Do you wish to support IKEv1?"
-msgstr "Souhaitez-vous gérer IKE v1 ?"
+"ne prendra effet que si le démon est redémarré. Cependant, cela pourrait "
+"interrompre provisoirement des connexions en cours."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
-"StrongSwan gère les versions 1 et 2 du protocole d'échange de clés sur "
-"Internet (IKE : « Internet Key Exchange »). Veuillez indiquer si le démon "
-"« pluto », qui gère la version 1 du protocole, doit être lancé au démarrage "
-"de strongSwan."
+"Si vous ne redémarrez pas StrongSwan maintenant, il est conseillé de le "
+"faire manuellement dès que possible."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-msgid "Do you wish to support IKEv2?"
-msgstr "Souhaitez-vous gérer IKE v2 ?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Faut-il démarrer le démon IKEv1 de StrongSwan ?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"StrongSwan gère les versions 1 et 2 du protocole d'échange de clés sur "
-"Internet (IKE : « Internet Key Exchange »). Veuillez indiquer si le démon "
-"« charon », qui gère la version 2 du protocole, doit être lancé au démarrage "
-"de strongSwan."
+"Le démon « pluto » doit fonctionner pour que la version 1 du protocole IKE "
+"(Internet Key Exchange) puisse être gérée."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-msgid "Do you want to create a RSA public/private keypair for this host?"
-msgstr ""
-"Souhaitez-vous créer une paire de clés RSA publique et privée pour cet hôte ?"
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Faut-il démarrer le démon IKEv2 de StrongSwan ?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"Cet outil d'installation peut créer automatiquement une paire de clés RSA "
-"publique et privée pour cet hôte. Cette paire de clés peut servir à "
-"authentifier des connexions IPSec vers d'autres hôtes. Cette méthode est la "
-"méthode conseillée pour l'établissement de liaisons IPSec sûres. L'autre "
-"possibilité d'authentification à la connexion est l'utilisation d'un secret "
-"partagé (« pre-shared key » : des mots de passe identiques aux deux "
-"extrémités du tunnel). Toutefois, pour de nombreuses connexions, "
-"l'authentification RSA est plus simple à administrer et plus sûre."
+"Le démon « charon » doit fonctionner pour que la version 2 du protocole IKE "
+"(Internet Key Exchange) puisse être gérée."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "If you do not want to create a new public/private keypair, you can choose "
-#| "to use an existing one."
-msgid ""
-"If you do not want to create a new public/private keypair, you can choose to "
-"use an existing one in the next step."
-msgstr ""
-"Si vous ne souhaitez pas créer une paire de clés publique et privée, vous "
-"pouvez choisir d'en utiliser une existante."
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Faut-il créer une paire de clés RSA publique et privée pour cet hôte ?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid "Do you have an existing X509 certificate file for strongSwan?"
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
 msgstr ""
-"Possédez-vous un fichier de certificat X509 existant à utiliser avec "
-"strongSwan ?"
+"StrongSwan peut utiliser une clé secrète partagée (PSK : « Pre-Shared Key ») "
+"ou une paire de clés RSA pour gérer l'authentification des connexions IPSec "
+"vers d'autres hôtes. L'authentification RSA est en général considérée comme "
+"plus sûre et plus simple à administrer. Les deux modes d'authentification "
+"peuvent être utilisés en même temps."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically extract the needed information from an "
-#| "existing X509 certificate with a matching RSA private key. Both parts can "
-#| "be in one file, if it is in PEM format. If you have such an existing "
-#| "certificate and key file and want to use it for authenticating IPSec "
-#| "connections, then please answer yes."
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
 msgstr ""
-"Cet outil d'installation est capable d'extraire automatiquement "
-"l'information nécessaire d'un fichier de certificat X509 existant, avec la "
-"clé privée RSA correspondante. Les deux parties peuvent se trouver dans un "
-"seul fichier, s'il est en format PEM. Indiquez si vous possédez un tel "
-"certificat ainsi que la clé privée, et si vous souhaitez vous en servir pour "
-"l'authentification des connexions IPSec."
+"Si vous ne souhaitez pas créer une paire de clés publique et privée, vous "
+"pouvez choisir d'en utiliser une existante."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, fuzzy
-#| msgid "File name of your X509 certificate in PEM format:"
-msgid "File name of your X.509 certificate in PEM format:"
-msgstr "Emplacement de votre certificat X509 au format PEM :"
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr ""
+"Faut-il utiliser un fichier de certificat X.509 existant avec strongSwan ?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, 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 X.509 certificate "
-"in PEM format."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
-"Veuillez indiquer l'emplacement du fichier contenant votre certificat X509 "
-"au format PEM."
+"L'information nécessaire peut être récupérée depuis un fichier de certificat "
+"X.509 existant, avec la clé privée RSA correspondante. Les deux parties "
+"peuvent se trouver dans un seul fichier, s'il est en format PEM. Vous "
+"devriez choisir cette option si vous possédez un tel certificat ainsi que la "
+"clé privée, et si vous souhaitez vous en servir pour l'authentification des "
+"connexions IPSec."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| msgid "File name of your X509 private key in PEM format:"
-msgid "File name of your X.509 private key in PEM format:"
-msgstr "Emplacement de votre clé privée X509 au format PEM :"
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Emplacement de votre certificat X.509 au format PEM :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| 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 contains the X509 certificate."
 msgid ""
-"Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
 msgstr ""
-"Veuillez indiquer l'emplacement du fichier contenant la clé privée RSA "
-"correspondant à votre certificat X509 au format PEM. Cela peut être le "
-"fichier qui contient le certificat X509."
+"Veuillez indiquer l'emplacement du fichier contenant votre certificat X.509 "
+"au format PEM."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
-msgstr "Longueur (en bits) de la clé RSA à créer :"
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Emplacement de votre clé privée X.509 actuelle au format PEM :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
 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."
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
-"Veuillez indiquer la longueur de la clé RSA qui sera créée. Elle ne doit pas "
-"être inférieure à 1024 bits car cela serait considéré comme insuffisamment "
-"sûr. Un choix excédant 2048 bits est probablement inutile car cela ne fait "
-"essentiellement que ralentir le processus d'authentification sans avoir "
-"d'intérêt actuellement."
+"Veuillez indiquer l'emplacement du fichier contenant la clé privée RSA "
+"correspondant à votre certificat X.509 au format PEM. Cela peut être le même "
+"fichier que le certificat X.509."
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid "Do you want to create a self-signed X509 certificate?"
-msgid "Do you want to create a self-signed X.509 certificate?"
-msgstr "Souhaitez-vous créer un certificat X509 autosigné ?"
+msgid "RSA key length:"
+msgstr "Taille de la clé RSA :"
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid ""
-#| "This installer can only create self-signed X509 certificates "
-#| "automatically, because otherwise a certificate authority is needed to "
-#| "sign the certificate request. If you want to create a self-signed "
-#| "certificate, you can use it immediately to connect to other IPSec hosts "
-#| "that support X509 certificate for authentication of IPSec connections. "
-#| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
-#| "you will need to have all X509 certificates signed by a single "
-#| "certificate authority to create a trust path."
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"Cet outil d'installation ne peut créer automatiquement qu'un certificat X509 "
-"autosigné puisqu'une autorité de certification est indispensable pour signer "
-"la demande de certificat. Si vous choisissez de créer un certificat "
-"autosigné, vous pourrez vous en servir immédiatement pour vous connecter aux "
-"hôtes qui authentifient les connexions IPSec avec des certificats X509. "
-"Cependant, si vous souhaitez utiliser les nouvelles fonctionnalités PKI de "
-"strongSwan >= 1.91, vous aurez besoin que tous les certificats X509 soient "
-"signés par la même autorité de certification afin de créer un chemin de "
-"confiance."
+"Veuillez indiquer la taille de la clé RSA que vous souhaitez créer. Une "
+"valeur inférieure à 1024 bits n'est pas considérée comme sûre. Une valeur "
+"supérieure à 2048 bits risque d'altérer les performances."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-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 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 "
-"certificat, que vous devrez ensuite faire signer par votre autorité de "
-"certification."
-
-#. Type: string
-#. Description
 #: ../strongswan-starter.templates:11001
-#, fuzzy
-#| msgid "Country code for the X509 certificate request:"
-msgid "Country code for the X.509 certificate request:"
-msgstr "Code du pays :"
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Faut-il créer un certificat X.509 auto-signé ?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
 msgstr ""
-"Veuillez indiquer le code à deux lettres de votre pays. Ce code sera inclus "
-"dans la demande de certificat."
+"Seuls les certificats X.509 auto-signés peuvent être créés automatiquement "
+"car, pour les autres certificats, une autorité de certification est "
+"indispensable."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 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."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
 msgstr ""
-"Il est impératif de choisir ici un code de pays valide sinon OpenSSL "
-"refusera de générer les certificats. Tous les autres champs d'un certificat "
-"X.509 peuvent être vides, sauf celui-ci."
+"Si vous choisissez cette option, le certificat qui sera créé pourra être "
+"utilisé immédiatement pour la connexion à d'autres hôtes IPSec qui gèrent "
+"l'authentification par certificat X.509. Cependant l'utilisation des "
+"fonctionnalités PKI (« Public Key Infrastructure » : infrastructure publique "
+"de clés) de strongSwan impose la création d'un chemin de confiance avec tous "
+"les certificats X.509 signés par la même autorité de certification."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Exemple : FR"
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Si vous ne choisissez pas cette option, seules la clé privée RSA et la "
+"demande de certificat seront créées. Vous devrez ensuite faire signer cette "
+"demande par une autorité de certification."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-#, fuzzy
-#| msgid "State or province name for the X509 certificate request:"
-msgid "State or province name for the X.509 certificate request:"
-msgstr "État, province ou région :"
+msgid "Country code for the X.509 certificate request:"
+msgstr "Code du pays pour le certificat X.509 :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
-"Veuillez indiquer le nom complet de l'état, de la province ou de la région "
-"où vous résidez. Ce nom sera inclus dans la demande de certificat."
+"Veuillez indiquer le code ISO3166 à deux lettres du pays qui sera utilisé "
+"dans la demande de certificat."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr ""
-"Exemples : Rhône-Alpes, Brabant Wallon, Bouches du Rhône, Québec, Canton de "
-"Vaud"
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr "Ce champ est obligatoire, sinon le certificat ne pourra pas être créé."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
-#, fuzzy
-#| msgid "Locality name for the X509 certificate request:"
-msgid "Locality name for the X.509 certificate request:"
-msgstr "Localité :"
+msgid "State or province name for the X.509 certificate request:"
+msgstr "État ou province pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
-"Veuillez indiquer la localité (p. ex. la ville) où vous résidez. Ce nom sera "
-"inclus dans la demande de certificat."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Exemple : Saint-Étienne"
+"Veuillez indiquer le nom complet de l'état ou de la province qui sera inclus "
+"dans la demande de certificat."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| msgid "Organization name for the X509 certificate request:"
-msgid "Organization name for the X.509 certificate request:"
-msgstr "Organisme :"
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Localité pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
-"Veuillez indiquer l'organisme (p. ex. l'entreprise) pour qui sera créé le "
-"certificat X509. Ce nom sera inclus dans la demande de certificat."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Exemple : Debian"
+"Veuillez indiquer la localité (le plus souvent la ville) qui sera utilisée "
+"dans la demande de certificat."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| msgid "Organizational unit for the X509 certificate request:"
-msgid "Organizational unit for the X.509 certificate request:"
-msgstr "Unité d'organisation :"
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Organisme pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Veuillez indiquer l'unité d'organisation (p. ex. département, division, "
-"etc.) pour qui sera créé le certificat X509. Ce nom sera inclus dans la "
-"demande de certificat."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Exemple : Département Réseaux et Informatique Scientifique"
+"Veuillez indiquer le nom de l'organisme (le plus souvent un nom "
+"d'entreprise) qui sera utilisé dans la demande de certificat."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-#| msgid "Common name for the X509 certificate request:"
-msgid "Common name for the X.509 certificate request:"
-msgstr "Nom commun :"
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Unité d'organisation pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
-"Veuillez indiquer le nom commun (p. ex. le nom réseau de cette machine) pour "
-"qui sera créé le certificat X509. Ce nom sera inclus dans la demande de "
-"certificat."
+"Veuillez indiquer l'unité d'organisation (p. ex. département, division, "
+"etc.) qui sera utilisée dans la demande de certificat."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Exemple : gateway.debian.org"
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Nom commun pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:17001
-#, fuzzy
-#| msgid "Email address for the X509 certificate request:"
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Veuillez indiquer le nom commun (p. ex. le nom réseau de cette machine) qui "
+"sera utilisé dans la demande de certificat."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
 msgid "Email address for the X.509 certificate request:"
-msgstr "Adresse électronique :"
+msgstr "Adresse électronique pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
-#, fuzzy
-#| 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 "
-#| "certificate request."
+#: ../strongswan-starter.templates:18001
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
-"Veuillez indiquer l'adresse électronique de la personne ou de l'organisme "
-"responsable du certificat X509. Cette adresse sera incluse dans la demande "
-"de certificat."
+"Veuillez indiquer l'adresse électronique (de la personne ou de l'organisme "
+"responsable) qui sera utilisée dans la demande de certificat."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
-msgstr "Souhaitez-vous activer le chiffrement opportuniste dans strongSwan ?"
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Faut-il activer le chiffrement opportuniste ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
 msgstr ""
-"StrongSwan gère le chiffrement opportuniste (« opportunistic encryption » : "
-"OE) qui permet de conserver les informations d'authentification IPSec (c'est-"
-"à-dire les clés publiques RSA) dans des enregistrements DNS, de préférence "
-"sécurisés. Tant que cette fonctionnalité ne sera pas déployée largement, son "
-"activation provoquera un ralentissement significatif pour toute nouvelle "
-"connexion sortante. À partir de la version 2.0, cette fonctionnalité est "
-"activée par défaut dans strongSwan, ce qui peut interrompre le "
-"fonctionnement de votre connexion à l'Internet (c'est-à-dire votre route par "
-"défaut) dès le démarrage de pluto, le démon de gestion de clés de strongSwan."
+"Cette version de strongSwan gère le chiffrement opportuniste (OE) qui "
+"conserve les informations d'authentification IPSec dans des enregistrements "
+"DNS. Tant que cette fonctionnalité n'est pas déployée largement, l'activer "
+"augmentera notablement la durée d'établissement des connexions sortantes."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"Veuillez choisir si vous souhaitez activer la gestion du chiffrement "
-"opportuniste. Ne l'activez pas si vous n'êtes pas certain d'en avoir besoin."
-
-#~ msgid "x509, plain"
-#~ msgstr "X509, Simple paire"
-
-#~ msgid "The type of RSA keypair to create:"
-#~ msgstr "Type de paire de clés RSA à créer :"
-
-#~ 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 ""
-#~ "Il est possible de créer une simple paire de clés destinée à être "
-#~ "utilisée avec strongSwan ou de créer un fichier de certificat X509 qui "
-#~ "contient la clé publique RSA et de conserver la clé privée correspondante "
-#~ "par ailleurs."
-
-#~ 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 "
-#~ "want to connect to other IPSec implementations, you will need a X509 "
-#~ "certificate. It is also possible to create a X509 certificate here and "
-#~ "extract the RSA public key in plain format if the other side runs "
-#~ "strongSwan without X509 certificate support."
-#~ msgstr ""
-#~ "Si vous ne prévoyez d'établir des connexions IPSec qu'avec des hôtes "
-#~ "utilisant strongSwan, il sera probablement plus facile d'utiliser des "
-#~ "clés RSA simples. Mais si vous souhaitez vous connecter à des hôtes "
-#~ "utilisant d'autres implémentations d'IPSec, vous aurez besoin d'un "
-#~ "certificat X509. Il est également possible de créer un certificat X509 "
-#~ "puis d'en extraire une simple clé publique RSA, si l'autre extrémité de "
-#~ "la connexion utilise Openswan sans la gestion des certificats X509."
-
-#~ 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 "
-#~ "certificate and its use in strongSwan anyway."
-#~ msgstr ""
-#~ "Ainsi, il vous est conseillé d'utiliser un certificat X509 car cette "
-#~ "méthode est plus souple. Cet outil d'installation devrait vous simplifier "
-#~ "la tâche de création et d'utilisation de ce certificat X509 avec "
-#~ "strongSwan."
+"Vous ne devriez l'activer que s'il est indispensable de l'utiliser. Il est "
+"possible que cela coupe la connexion Internet (la route par défaut) au "
+"moment où le démon « pluto » démarre."
diff --git a/debian/po/gl.po b/debian/po/gl.po
new file mode 100644
index 000000000..0c913f511
--- /dev/null
+++ b/debian/po/gl.po
@@ -0,0 +1,431 @@
+# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the strongswan package.
+#
+# marce villarino <mvillarino@users.sourceforge.net>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: templates_[kI6655]\n"
+"Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 14:50+0100\n"
+"Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n"
+"Language-Team: Galician <proxecto@trasno.ent>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "o primeiro"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "despois do NFS"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "despois do PCMCIA"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Cando iniciar strongSwan:"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
+"StrongSwan iniciase durante o arrinque do sistema de maneira que poda "
+"protexer sistemas de ficheiros que se monten automaticamente."
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
+msgstr ""
+" * o primeiro: se /usr non se monta mediante NFS e non se emprega unha\n"
+"   tarxeta PCMCIA, é mellor iniciar strongSwan tan axiña como se poda,\n"
+"   para que as montaxes NFS podan asegurarse mediante IPSec,\n"
+" * despois do NFS: recoméndase cando /usr se monte mediante NFS e non\n"
+"   se empregue ningunha tarxeta PCMCIA,\n"
+" * despois do PCMCIA: recoméndase se a conexión IPSec emprega unha tarxeta\n"
+"   de rede PCMCIA ou se fose preciso que as chaves se obteñan desde un\n"
+"   servidor DNS a executarse localmente con soporte para DNSSec."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Desexa reiniciar strongSwan agora?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid ""
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
+"existing connections and then bring them back up."
+msgstr ""
+"Recoméndase reiniciar strongSwan porque se houbese algunha actualización de "
+"seguridade non se aplicará até que se reinicie o daemon. Porén, pode pechar "
+"as conexións existentes e logo volver a recuperalas."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid ""
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
+msgstr ""
+"Se non reinicia agora strongSwan debería facelo manualmente en canto poda."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Desexa iniciar o daemon IKEv1 de strongSwan?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid ""
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"O daemon pluto debe estar en execución para soportar a versión 1 do "
+"protocolo Internet Key Exchange."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Desexa iniciar o IKEv2 de strongSwan?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"O daemon charon debe estar en execución para soportar a versión 2 do "
+"protocolo Internet Key Exchange."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Desexa crear un par de chaves pública/privada RSA para este servidor?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
+"StrongSwan pode empregar unha chave precompartida (PSK) ou un par de chaves "
+"RSA para autenticar as conexións IPSec con outros servidores. A "
+"autenticación RSA xeralmente considérase máis segura e é máis fácil de "
+"administrar. Pode empregar as autenticacións PSK e RSA á vez."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
+msgstr ""
+"Se son quer crear un novo par de chaves pública/privada, no seguinte paso "
+"pode escoller empregar unha xa existente."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Desexa empregar un certificado X.509 xa existente para strongSwan?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid ""
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
+msgstr ""
+"A información requirida pode extraerse automaticamente a partir dun "
+"certificado X.509 xa existente coa chave privada RSA que corresponda. Ambas "
+"as partes poden estar nun ficheiro se este está no formato PEM. Debe "
+"escoller esta opción se ten tal certificado e chave e quere empregalo para "
+"autenticar conexións IPSec."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Nome do ficheiro do certificado X.509 en formato PEM:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid ""
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
+msgstr ""
+"Indique a rota completa ao ficheiro que contén o certificado X.509 en "
+"formato PEM."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Nome do ficheiro coa chave privada X.509 en formato PEM:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid ""
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
+msgstr ""
+"Indique a rota completa ao ficheiro que contén a chave privada RSA que se "
+"corresponde do certificado X.509 en formato PEM. Este pode ser o mesmo "
+"ficheiro que o do certificado X.509."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr "Lonxitude da chave RSA:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+msgid ""
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
+msgstr ""
+"Indique a lonxitude da chave RSA que desexe xerar. Os valores menores de "
+"1024 bits non se consideran seguros, mentres que os maiores de 2048 bits "
+"posibelmente afecten ao rendemento."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Desexa crear un certificado X.509 autoasinado?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
+"Só se poden crear automaticamente certificados X.509 autoasinados, porque "
+"noutro caso é precisa unha autoridade de certificación para asinar o pedido "
+"de certificado."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+"Se acepta esta opción o certificado que se cree pode empregarse "
+"inmediatamente para conectarse con outros servidores IPSec que soporten a "
+"autenticación mediante un certificado X.509. Porén, par empregar as "
+"funcionalidades PKI de strongSwan requírese que se cree unha rota de "
+"confianza asinando todos os certificados X.509 por unha única autoridade."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Se non acepta esta opción só se creará a chave privada RSA, xunto cun pedido "
+"de certificado que precisará que lle asine unha autoridade de certificación."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "Country code for the X.509 certificate request:"
+msgstr "Código de país para o pedido do certificado X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid ""
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
+msgstr ""
+"Indique o código de país ISO3166 de dúas letras que se debe empregar no "
+"pedido de certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr ""
+"Este campo é obrigatorio, caso contrario non se poderá xerar un certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid "State or province name for the X.509 certificate request:"
+msgstr "Nome do estado ou provincia para o pedido de certificado X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid ""
+"Please enter the full name of the state or province to include in the "
+"certificate request."
+msgstr ""
+"Indique o nome completo do estado ou provincia a incluír no pedido de "
+"certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Nome de localidade para o pedido de certificado X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid ""
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
+msgstr ""
+"Indique o nome da localidade (xeralmente unha cidade) que se debe empregar "
+"no pedido de certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Nome da organización para o pedido de certificado X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid ""
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
+msgstr ""
+"Indique o nome da organización (xeralmente unha empresa) que se debe "
+"empregar no pedido de certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Unidade organizacional para o pedido de certificado X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+msgid ""
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
+msgstr ""
+"Indique o nome da unidade organizacional (xeralmente un departamento) que "
+"debe empregarse no pedido de certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Nome común para o pedido de certificado X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Indique o nome común (como o nome desta máquina) que se debe empregar no "
+"pedido de certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid "Email address for the X.509 certificate request:"
+msgstr "Enderezo de correo electrónico para o pedido de certificado X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid ""
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
+msgstr ""
+"Indique o enderezo de correo electrónico (do individuo ou do responsábel da "
+"organización) que se debe empregar no pedido de certificado."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Desexa activar a cifraxe oportunista?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
+"Esta versión de strongSwan soporta a cifraxe oportunista (OE) que garda a "
+"información de autenticación de IPSec en rexistros de DNS. Até que estea "
+"amplamente utilizado activalo provocará un retardo significativo en cada "
+"nova conexión saínte."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
+msgstr ""
+"Só debería activar a cifraxe oportunista se está certo de que a desexa. Pode "
+"estragar a conexión a Internet (a rota por omisión) segundo se inicie o "
+"daemon pluto."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 8a89a3c75..4b7683e25 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,10 +14,10 @@
 # 

 msgid ""
 msgstr ""
-"Project-Id-Version: strongswan 4.1.8-2\n"
+"Project-Id-Version: strongswan 4.2.14-1\n"
 "Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
-"PO-Revision-Date: 2008-01-31 06:52+0900\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-04-23 06:52+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,89 +26,71 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "可能な限り早く, \"NFS 起動後\", \"PCMCIA 起動後\""
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
-msgstr "strongSwan の起動タイミング:"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
 msgstr ""
-"strongSwan を起動させるタイミングの選択肢としては3つが考えられます: NFS サー"
-"ビスの開始前・開始後・PCMCIA サービスの開始後、です。正解はあなたの設定次第で"
-"す。"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"NFS 経由で /usr をマウントせず (他のパーティションやあまり重要ではないパー"
-"ティションを NFS 経由でマウントするか、または NFS マウントを全く使わない)、加"
-"えて PCMCIA ネットワークカードを利用していない場合、可能な限り早いタイミング"
-"で strongSwan を起動するのがベストです。この設定によって、NFS でのマウントは "
-"IPSec で保護されます。この場合 (またはこの問題を理解していないか特に気にしな"
-"い場合) 、\"可能な限り早く\"と質問に答えてください (標準設定です) 。"
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "strongSwan の起動タイミング:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
-msgstr ""
-"NFS 経由で /usr をマウントしていて PCMCIA ネットワークカードを使用していない"
-"場合は、必要なファイルを利用可能にするために strongSwan を NFS の後で起動しな"
-"ければなりません。この場合、\"NFS 起動後\" と答えてください。この時に NFS 経"
-"由でマウントされる /usr は、IPSec によるセキュアな状態にはならないということ"
-"に注意してください。"
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
-"IPSec 接続に PCMCIA ネットワークカードを利用していた場合、PCMCIA サービスの起"
-"動後に strongSwan を起動する以外に選択はありません。この場合、\"PCMCIA 起動後"
-"\" と答えてください。ローカルで動作している DNSSec 機能を使用している DNS "
-"サーバから鍵を取得したい場合でも、この答えをしてください。"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
-msgstr "strongSwan を再起動しますか?"
+#: ../strongswan-starter.templates:3001
+#, fuzzy
+#| msgid "When to start strongSwan:"
+msgid "Restart strongSwan now?"
+msgstr "strongSwan の起動タイミング:"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Restarting strongSwan is a good idea, since if there is a security fix, "
+#| "it will not be fixed until the daemon restarts. Most people expect the "
+#| "daemon to restart, so this is generally a good idea. However this might "
+#| "take down existing connections and then bring them back up."
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
 "セキュリティ修正があった場合にはデーモンが再起動されるまで修正が反映されませ"
@@ -119,228 +101,191 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:3001
-msgid "Do you wish to support IKEv1?"
-msgstr "IKEv1 をサポートしますか?"
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
-"strongSwan は IKEv1 と IKEv2 の両方のインターネット鍵交換プロトコルをサポート"
-"しています。strongSwan が起動する際、IKEv1 サポートのため \"pluto\" デーモン"
-"を起動しますか?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-msgid "Do you wish to support IKEv2?"
-msgstr "IKEv2 をサポートしますか?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"strongSwan は IKEv1 と IKEv2 の両方のインターネット鍵交換プロトコルをサポート"
-"しています。strongSwan が起動する際、IKEv2 サポートのため \"pluto\" デーモン"
-"を起動しますか?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-msgid "Do you want to create a RSA public/private keypair for this host?"
-msgstr "このホストの RSA 公開鍵・秘密鍵のキーペアを生成しますか?"
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
-msgstr ""
-"このインストーラはこのホストの RSA 公開鍵・秘密鍵のキーペアを自動的に生成でき"
-"ます。このキーペアは他のホストとの IPSec 通信での認証に利用可能で、セキュア"
-"な IPSec 通信を確立する方法として好まれています。他に利用可能な方法としては共"
-"通鍵 (トンネルの双方で同じパスワード) を通信の認証に利用するというのがありま"
-"すが、多数の接続に対しては、RSA 認証のほうが管理がより簡単で、よりセキュアで"
-"す。"
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter.templates:6001
 #, fuzzy
-#| msgid ""
-#| "If you do not want to create a new public/private keypair, you can choose "
-#| "to use an existing one."
+#| msgid "Do you want to create a RSA public/private keypair for this host?"
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "このホストの RSA 公開鍵・秘密鍵のキーペアを生成しますか?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
 msgid ""
 "If you do not want to create a new public/private keypair, you can choose to "
 "use an existing one in the next step."
 msgstr ""
-"新たな公開鍵・秘密鍵のキーペアを生成したくない場合は、既存のキーペアの利用を"
-"選択することも可能です。"
+"新たな公開鍵・秘密鍵のキーペアを生成したくない場合は、次の段階で既存のキーペ"
+"アの利用を選択することも可能です。"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
-#| msgid "Do you have an existing X509 certificate file for strongSwan?"
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
-msgstr "既に存在している X509 証明書ファイルを strongSwan で利用しますか?"
+#| msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "既に存在している X.509 証明書ファイルを strongSwan で利用しますか?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
 #| msgid ""
 #| "This installer can automatically extract the needed information from an "
-#| "existing X509 certificate with a matching RSA private key. Both parts can "
-#| "be in one file, if it is in PEM format. If you have such an existing "
+#| "existing X.509 certificate with a matching RSA private key. Both parts "
+#| "can be in one file, if it is in PEM format. If you have such an existing "
 #| "certificate and key file and want to use it for authenticating IPSec "
 #| "connections, then please answer yes."
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
-msgstr ""
-"このインストーラは既に存在している X509 証明書から RSA 秘密鍵と照らし合わせて"
-"必要な情報を自動的に展開する事が可能です。 PEM 形式の場合、双方を一つのファイ"
-"ルにまとめることも可能です。そのような証明書と鍵のファイルがあり、これらを "
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
+msgstr ""
+"このインストーラは既に存在している X.509 証明書から RSA 秘密鍵と照らし合わせ"
+"て必要な情報を自動的に展開する事が可能です。 PEM 形式の場合、双方を一つのファ"
+"イルにまとめることも可能です。そのような証明書と鍵のファイルがあり、これらを "
 "IPSec 通信での認証に使用したい場合は「はい」と答えてください。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
-#, fuzzy
-#| msgid "File name of your X509 certificate in PEM format:"
+#: ../strongswan-starter.templates:8001
 msgid "File name of your X.509 certificate in PEM format:"
-msgstr "PEM 形式の X509 証明書のファイル名:"
+msgstr "PEM 形式の X.509 証明書のファイル名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
-#, fuzzy
-#| msgid ""
-#| "Please enter the full location of the file containing your X509 "
-#| "certificate in PEM format."
+#: ../strongswan-starter.templates:8001
 msgid ""
 "Please enter the full location of the file containing your X.509 certificate "
 "in PEM format."
 msgstr ""
-"PEM 形式の X509 証明書を含むファイルの場所を絶対パスで入力してください。"
+"PEM 形式の X.509 証明書を含むファイルの場所を絶対パスで入力してください。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
-#| msgid "File name of your X509 private key in PEM format:"
-msgid "File name of your X.509 private key in PEM format:"
-msgstr "PEM 形式の X509 秘密鍵のファイル名:"
+#| msgid "File name of your X.509 private key in PEM format:"
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "PEM 形式の X.509 秘密鍵のファイル名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
 #| 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 contains the X509 certificate."
+#| "matching your X.509 certificate in PEM format. This can be the same file "
+#| "that contains the X.509 certificate."
 msgid ""
 "Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
-"PEM 形式の X509 証明書に対応する RSA 秘密鍵を含んでいるファイルの場所を絶対パ"
-"スで入力してください。これは X509 証明書を含んでいるファイルと同じで構いませ"
-"ん。"
+"PEM 形式の X.509 証明書に対応する RSA 秘密鍵を含んでいるファイルの場所を絶対"
+"パスで入力してください。これは X.509 証明書を含んでいるファイルと同じで構いま"
+"せん。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
-msgstr "RSA 鍵の鍵長（ビット数）:"
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter.templates:10001
 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."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"生成する RSA 鍵の長さを入力してください。安全のため、1024 ビット未満にすべき"
-"ではありません。2048 ビットより大きなものにする必要もないでしょう。認証プロセ"
-"スが遅くなりますし、現時点ではおそらく必要ありません。"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
 #, fuzzy
-#| msgid "Do you want to create a self-signed X509 certificate?"
-msgid "Do you want to create a self-signed X.509 certificate?"
-msgstr "自己署名 X509 証明書を生成しますか?"
+#| msgid "Do you want to create a self-signed X.509 certificate?"
+msgid "Create a self-signed X.509 certificate?"
+msgstr "自己署名 X.509 証明書を生成しますか?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid ""
-#| "This installer can only create self-signed X509 certificates "
-#| "automatically, because otherwise a certificate authority is needed to "
-#| "sign the certificate request. If you want to create a self-signed "
-#| "certificate, you can use it immediately to connect to other IPSec hosts "
-#| "that support X509 certificate for authentication of IPSec connections. "
-#| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
-#| "you will need to have all X509 certificates signed by a single "
-#| "certificate authority to create a trust path."
+#: ../strongswan-starter.templates:11001
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
-msgstr ""
-"証明書要求に署名するためには認証局が必要となるので、このインストーラでは自己"
-"署名 X509 証明書を自動的に生成する事だけが可能です。自己署名証明書を生成した"
-"い場合、これを使用してすぐに X509 証明書をサポートしている他の IPSec ホストに"
-"接続可能です。しかし、strongSwan バージョン 1.91 以上での新しい PKI 機能を使"
-"いたい場合は、trust path を生成するために単一の認証局によってすべての X509 証"
-"明書に署名してもらう必要があります。"
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
 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 get the certificate request signed by your certificate "
-"authority."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates: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 get the certificate request signed by your "
+#| "certificate authority."
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
 msgstr ""
 "自己署名証明書を生成したくないという場合は、このインストーラでは RSA 秘密鍵と"
 "証明書要求のみを生成します。そのため、認証局に証明書要求へ署名をしてもらう必"
@@ -348,271 +293,358 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
-#, fuzzy
-#| msgid "Country code for the X509 certificate request:"
+#: ../strongswan-starter.templates:12001
 msgid "Country code for the X.509 certificate request:"
-msgstr "X509 証明書要求に記載する国コード:"
+msgstr "X.509 証明書要求に記載する国コード:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter.templates:12001
+#, fuzzy
+#| msgid ""
+#| "Please enter the 2 letter country code for your country. This code will "
+#| "be placed in the certificate request."
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
 "あなたの国の国コードを2文字で入力してください。このコードは証明書要求に記載さ"
 "れます。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
-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."
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
 msgstr ""
-"openssl が国コードなしでは証明書の生成を拒否するので、正しい国コードをここで"
-"入力する必要があります。X.509 証明書では、他のフィールドについては空でも構い"
-"ませんが、これについては許可されていません。"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "例: JP"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
-#, fuzzy
-#| msgid "State or province name for the X509 certificate request:"
+#: ../strongswan-starter.templates:13001
 msgid "State or province name for the X.509 certificate request:"
-msgstr "X509 証明書要求に記載する都道府県名:"
+msgstr "X.509 証明書要求に記載する都道府県名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter.templates:13001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full name of the state or province you live in. This "
+#| "name will be placed in the certificate request."
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
 "あなたが在住している都道府県を入力してください。これは証明書要求に記載されま"
 "す。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "例: Tokyo"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
-#, fuzzy
-#| msgid "Locality name for the X509 certificate request:"
+#: ../strongswan-starter.templates:14001
 msgid "Locality name for the X.509 certificate request:"
-msgstr "X509 証明書要求に記載する地域名:"
+msgstr "X.509 証明書要求に記載する地域名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter.templates:14001
+#, fuzzy
+#| msgid ""
+#| "Please enter the locality (e.g. city) where you live. This name will be "
+#| "placed in the certificate request."
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
 "あなたの在住している地域の名前 (例: 市町村名) を入力してください。これは証明"
 "書要求に記載されます。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "例: Shinjuku-ku"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-#, fuzzy
-#| msgid "Organization name for the X509 certificate request:"
+#: ../strongswan-starter.templates:15001
 msgid "Organization name for the X.509 certificate request:"
-msgstr "X509 証明書要求に記載する組織名:"
+msgstr "X.509 証明書要求に記載する組織名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter.templates:15001
 #, fuzzy
 #| msgid ""
-#| "Please enter the organization (e.g. company) that the X509 certificate "
+#| "Please enter the organization (e.g. company) that the X.509 certificate "
 #| "should be created for. This name will be placed in the certificate "
 #| "request."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"X509 証明書の生成対象となるべき組織 (例: 会社) を入力してください。これは証明"
-"書要求に記載されます。"
+"X.509 証明書の生成対象となるべき組織 (例: 会社) を入力してください。これは証"
+"明書要求に記載されます。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "例: Debian"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:15001
-#, fuzzy
-#| msgid "Organizational unit for the X509 certificate request:"
+#: ../strongswan-starter.templates:16001
 msgid "Organizational unit for the X.509 certificate request:"
-msgstr "X509 証明書要求に記載する組織単位:"
+msgstr "X.509 証明書要求に記載する組織単位:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter.templates:16001
 #, fuzzy
 #| msgid ""
-#| "Please enter the organizational unit (e.g. section) that the X509 "
+#| "Please enter the organizational unit (e.g. section) that the X.509 "
 #| "certificate should be created for. This name will be placed in the "
 #| "certificate request."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
-"X509 証明書の生成対象となるべき組織単位 (例: 部署名) を入力してください。これ"
-"は証明書要求に記載されます。"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "例: security group"
+"X.509 証明書の生成対象となるべき組織単位 (例: 部署名) を入力してください。こ"
+"れは証明書要求に記載されます。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-#, fuzzy
-#| msgid "Common name for the X509 certificate request:"
+#: ../strongswan-starter.templates:17001
 msgid "Common name for the X.509 certificate request:"
-msgstr "X509 証明書要求に記載するコモンネーム:"
+msgstr "X.509 証明書要求に記載するコモンネーム:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter.templates:17001
 #, fuzzy
 #| 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 "
+#| "which the X.509 certificate should be created for. This name will be "
 #| "placed in the certificate request."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
 msgstr ""
-"X509 証明書の生成対象となるべきコモンネーム (例: このマシンのホスト名) を入力"
-"してください。これは証明書要求に記載されます。"
+"X.509 証明書の生成対象となるべきコモンネーム (例: このマシンのホスト名) を入"
+"力してください。これは証明書要求に記載されます。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "例: gateway.debian.org"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:17001
-#, fuzzy
-#| msgid "Email address for the X509 certificate request:"
+#: ../strongswan-starter.templates:18001
 msgid "Email address for the X.509 certificate request:"
-msgstr "X509 証明書要求に記載するメールアドレス:"
+msgstr "X.509 証明書要求に記載するメールアドレス:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 #, fuzzy
 #| 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 "
+#| "responsible for the X.509 certificate. This address will be placed in the "
 #| "certificate request."
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
-"X509 証明書の責任者となる人物・団体のメールアドレスを入力してください。このア"
-"ドレスは証明書要求に記載されます。"
+"X.509 証明書の責任者となる人物・団体のメールアドレスを入力してください。この"
+"アドレスは証明書要求に記載されます。"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+#: ../strongswan-starter.templates:19001
+#, fuzzy
+#| msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+msgid "Enable opportunistic encryption?"
 msgstr "strongSwan で opportunistic encryption を有効にしますか?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
-msgstr ""
-"strongSwan は、IPSec 認証情報 (例: RSA 公開鍵) を (願わくはセキュアな) DNS レ"
-"コード内に保存する opportunistic encryption (OE) をサポートしています。これは"
-"広く利用されるようになるまで、有効にすると外部への新規接続は全て格段に遅くな"
-"ります。バージョン 2.0 より strongSwan の開発元はデフォルトで OE を有効にして"
-"います。そのため pluto (strongSwan 鍵署名デーモン) が開始するとすぐ、既存のイ"
-"ンターネット接続 (つまりデフォルトルート) が中断されるかもしれません。"
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"OE のサポートを有効にするかどうかを選んでください。よくわからない場合は、有効"
-"にはしないでください。"
 
-#~ msgid "x509, plain"
-#~ msgstr "x509, 通常のタイプ"
+#~ msgid "earliest, \"after NFS\", \"after PCMCIA\""
+#~ msgstr "可能な限り早く, \"NFS 起動後\", \"PCMCIA 起動後\""
 
-#~ msgid "The type of RSA keypair to create:"
-#~ msgstr "生成する RSA キーペアのタイプ:"
+#~ msgid ""
+#~ "There are three possibilities when strongSwan can start: before or after "
+#~ "the NFS services and after the PCMCIA services. The correct answer "
+#~ "depends on your specific setup."
+#~ msgstr ""
+#~ "strongSwan を起動させるタイミングの選択肢としては3つが考えられます: NFS "
+#~ "サービスの開始前・開始後・PCMCIA サービスの開始後、です。正解はあなたの設"
+#~ "定次第です。"
 
 #~ 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."
+#~ "If you do not have your /usr tree mounted via NFS (either you only mount "
+#~ "other, less vital trees via NFS or don't use NFS mounted trees at all) "
+#~ "and don't use a PCMCIA network card, then it's best to start strongSwan "
+#~ "at the earliest possible time, thus allowing the NFS mounts to be secured "
+#~ "by IPSec. In this case (or if you don't understand or care about this "
+#~ "issue), answer \"earliest\" to this question (the default)."
 #~ msgstr ""
-#~ "strongSwan で利用する通常の RSA 公開鍵・秘密鍵のキーペアを作れます。あるい"
-#~ "は RSA 公開鍵 (さらにはそれに対応する秘密鍵も) を含む X509 証明書ファイル"
-#~ "も同様です。"
+#~ "NFS 経由で /usr をマウントせず (他のパーティションやあまり重要ではないパー"
+#~ "ティションを NFS 経由でマウントするか、または NFS マウントを全く使わな"
+#~ "い)、加えて PCMCIA ネットワークカードを利用していない場合、可能な限り早い"
+#~ "タイミングで strongSwan を起動するのがベストです。この設定によって、NFS で"
+#~ "のマウントは IPSec で保護されます。この場合 (またはこの問題を理解していな"
+#~ "いか特に気にしない場合) 、\"可能な限り早く\"と質問に答えてください (標準設"
+#~ "定です) 。"
+
+#~ msgid ""
+#~ "If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
+#~ "card, then you will need to start strongSwan after NFS so that all "
+#~ "necessary files are available. In this case, answer \"after NFS\" to this "
+#~ "question. Please note that the NFS mount of /usr can not be secured by "
+#~ "IPSec in this case."
+#~ msgstr ""
+#~ "NFS 経由で /usr をマウントしていて PCMCIA ネットワークカードを使用していな"
+#~ "い場合は、必要なファイルを利用可能にするために strongSwan を NFS の後で起"
+#~ "動しなければなりません。この場合、\"NFS 起動後\" と答えてください。この時"
+#~ "に NFS 経由でマウントされる /usr は、IPSec によるセキュアな状態にはならな"
+#~ "いということに注意してください。"
+
+#~ msgid ""
+#~ "If you use a PCMCIA network card for your IPSec connections, then you "
+#~ "only have to choose to start it after the PCMCIA services. Answer \"after "
+#~ "PCMCIA\" 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 ""
+#~ "IPSec 接続に PCMCIA ネットワークカードを利用していた場合、PCMCIA サービス"
+#~ "の起動後に strongSwan を起動する以外に選択はありません。この場合、"
+#~ "\"PCMCIA 起動後\" と答えてください。ローカルで動作している DNSSec 機能を使"
+#~ "用している DNS サーバから鍵を取得したい場合でも、この答えをしてください。"
+
+#~ msgid "Do you wish to restart strongSwan?"
+#~ msgstr "strongSwan を再起動しますか?"
+
+#~ msgid "Do you wish to support IKEv1?"
+#~ msgstr "IKEv1 をサポートしますか?"
+
+#~ 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 ""
+#~ "strongSwan は IKEv1 と IKEv2 の両方のインターネット鍵交換プロトコルをサ"
+#~ "ポートしています。strongSwan が起動する際、IKEv1 サポートのため \"pluto\" "
+#~ "デーモンを起動しますか?"
+
+#~ msgid "Do you wish to support IKEv2?"
+#~ msgstr "IKEv2 をサポートしますか?"
+
+#~ 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 ""
+#~ "strongSwan は IKEv1 と IKEv2 の両方のインターネット鍵交換プロトコルをサ"
+#~ "ポートしています。strongSwan が起動する際、IKEv2 サポートのため \"pluto\" "
+#~ "デーモンを起動しますか?"
+
+#~ msgid ""
+#~ "This installer can automatically create a RSA public/private keypair with "
+#~ "an X.509 certificate for this host. This can be used to authenticate  "
+#~ "IPSec connections to other hosts and is the preferred way for building "
+#~ "up  secure IPSec connections. The other possibility would be to use pre-"
+#~ "shared  secrets (PSKs, passwords that are the same on both sides of the "
+#~ "tunnel) for authenticating an connection, but for a larger number of "
+#~ "connections RSA authentication is easier to administer and more secure. "
+#~ "Note that having a keypair allows to use both X.509 and PSK "
+#~ "authentication for IPsec  tunnels."
+#~ msgstr ""
+#~ "このインストーラはこのホストの X.509 認証用の RSA 公開鍵・秘密鍵のキーペア"
+#~ "を自動的に生成できます。このキーペアは他のホストとの IPSec 通信での認証に"
+#~ "利用可能で、セキュアな IPSec 通信を確立する方法として好まれています。他に"
+#~ "利用可能な方法としては事前に設定してある共通鍵 (PSK、トンネルの双方で同じ"
+#~ "パスワードをを利用する) を通信の認証に利用するというのがありますが、多数の"
+#~ "接続に対しては、RSA 認証のほうが管理がより簡単でよりセキュアです。キーペア"
+#~ "を利用することは、X.509 認証と PSK 認証の双方を IPsec トンネルに許可するこ"
+#~ "とに注意してください。"
+
+#~ msgid "The length of the created RSA key (in bits):"
+#~ msgstr "RSA 鍵の鍵長（ビット数）:"
+
+#~ 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."
+#~ msgstr ""
+#~ "生成する RSA 鍵の長さを入力してください。安全のため、1024 ビット未満にすべ"
+#~ "きではありません。2048 ビットより大きなものにする必要もないでしょう。認証"
+#~ "プロセスが遅くなりますし、現時点ではおそらく必要ありません。"
+
+#~ msgid ""
+#~ "This installer can only create self-signed X.509 certificates "
+#~ "automatically, because otherwise a certificate authority is needed to "
+#~ "sign the certificate request. If you want to create a self-signed "
+#~ "certificate, you can use it immediately to connect to other IPSec hosts "
+#~ "that support X.509 certificate for authentication of IPSec connections. "
+#~ "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~ "you will need to have all X.509 certificates signed by a single "
+#~ "certificate authority to create a trust path."
+#~ msgstr ""
+#~ "証明書要求に署名するためには認証局が必要となるので、このインストーラでは自"
+#~ "己署名 X.509 証明書を自動的に生成する事だけが可能です。自己署名証明書を生"
+#~ "成したい場合、これを使用してすぐに X.509 証明書をサポートしている他の "
+#~ "IPSec ホストに接続可能です。しかし、strongSwan バージョン 1.91 以上での新"
+#~ "しい PKI 機能を使いたい場合は、trust path を生成するために単一の認証局に"
+#~ "よってすべての X.509 証明書に署名してもらう必要があります。"
+
+#~ 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 ""
+#~ "openssl が国コードなしでは証明書の生成を拒否するので、正しい国コードをここ"
+#~ "で入力する必要があります。X.509 証明書では、他のフィールドについては空でも"
+#~ "構いませんが、これについては許可されていません。"
+
+#~ msgid "Example: AT"
+#~ msgstr "例: JP"
+
+#~ msgid "Example: Upper Austria"
+#~ msgstr "例: Tokyo"
+
+#~ msgid "Example: Vienna"
+#~ msgstr "例: Shinjuku-ku"
+
+#~ msgid "Example: Debian"
+#~ msgstr "例: Debian"
+
+#~ msgid "Example: security group"
+#~ msgstr "例: security group"
+
+#~ msgid "Example: gateway.debian.org"
+#~ msgstr "例: gateway.debian.org"
 
 #~ 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 "
-#~ "want to connect to other IPSec implementations, you will need a X509 "
-#~ "certificate. It is also possible to create a X509 certificate here and "
-#~ "extract the RSA public key in plain format if the other side runs "
-#~ "strongSwan without X509 certificate support."
+#~ "strongSwan comes with support for opportunistic encryption (OE), which "
+#~ "stores IPSec authentication information (i.e. RSA public keys) in "
+#~ "(preferably secure) DNS records. Until this is widely deployed, "
+#~ "activating it will cause a significant slow-down for every new, outgoing "
+#~ "connection. Since version 2.0, strongSwan upstream comes with OE enabled "
+#~ "by default and is thus likely to break your existing connection to the "
+#~ "Internet (i.e. your default route) as soon as pluto (the strongSwan "
+#~ "keying daemon) is started."
 #~ msgstr ""
-#~ "既に strongSwan を動作させているホストと IPSec 通信を確立したいだけの場合"
-#~ "は、通常の RSA キーペアを使用すると多少簡単になります。しかし、他の IPSec "
-#~ "実装との接続を行いたい場合は X509 証明書が必要になります。通信を行う対象の"
-#~ "ホストが strongSwan を X509 証明書のサポート無しで運用していた場合、ここ"
-#~ "で X509 証明書を生成してから、後ほど RSA 公開鍵を通常の形式に展開すること"
-#~ "も可能です。"
+#~ "strongSwan は、IPSec 認証情報 (例: RSA 公開鍵) を (願わくはセキュアな) "
+#~ "DNS レコード内に保存する opportunistic encryption (OE) をサポートしていま"
+#~ "す。これは広く利用されるようになるまで、有効にすると外部への新規接続は全て"
+#~ "格段に遅くなります。バージョン 2.0 より strongSwan の開発元はデフォルトで "
+#~ "OE を有効にしています。そのため pluto (strongSwan 鍵署名デーモン) が開始す"
+#~ "るとすぐ、既存のインターネット接続 (つまりデフォルトルート) が中断されるか"
+#~ "もしれません。"
 
 #~ 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 "
-#~ "certificate and its use in strongSwan anyway."
+#~ "Please choose whether you want to enable support for OE. If unsure, do "
+#~ "not enable it."
 #~ msgstr ""
-#~ "したがって X509 証明書がお勧めです。こちらのほうが柔軟ですし、このインス"
-#~ "トーラを使えば、X509 証明書の生成や strongSwan での利用に際しての面倒さを"
-#~ "隠蔽してくれるはずです。"
+#~ "OE のサポートを有効にするかどうかを選んでください。よくわからない場合は、"
+#~ "有効にはしないでください。"
diff --git a/debian/po/nb.po b/debian/po/nb.po
new file mode 100644
index 000000000..b91c04576
--- /dev/null
+++ b/debian/po/nb.po
@@ -0,0 +1,439 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: nb\n"
+"Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 14:59+0100\n"
+"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "tidligst"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "etter NFS"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "etter PCMCIA"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Når strongSwan skal startes:"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
+"StrongSwan starter under systemoppstart, slik at det kan beskytte "
+"filsystemer som monteres automatisk."
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
+msgstr ""
+" * tidligst: hvis /usr ikke monteres via NFS og du ikke bruker et\n"
+"   PCMCIA nettverkskort, så er det best å starte strongSwan\n"
+"   snarest mulig, slik at NFS-montering kan sikres med IPSec;\n"
+"    * etter NFS: anbefales når /usr monteres via NFS og det ikke\n"
+"    brukes noe PCMCIA nettverkskort.\n"
+" * etter PCMCIA: anbefales hvis IPSec-tilkoblingen bruker et PCMCIA\n"
+"    nettverkskort eller om den trenger å hente nøkler fra en lokal\n"
+"    DNS-tjener med DNSSec-støtte. "
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Start strongSwan på nytt nå"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid ""
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
+"existing connections and then bring them back up."
+msgstr ""
+"Det anbefales å starte strongSwan på nytt nå, for om det var en "
+"sikkerhetsrettelse, så får den ikke effekt før daemonen startes på nytt. "
+"Imidlertid kan dette lukke eksisterende forbindelser og deretter koble dem "
+"opp igjen."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+#| msgid ""
+#| "If you don't restart strongSwan now, you should do so manually at the "
+#| "first  opportunity."
+msgid ""
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
+msgstr ""
+"Hvis du ikke gjør en omstart på strongSwan nå, så bør du gjøre det manuelt "
+"ved første anledning."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Skal strongSwans IKEv1-daemon startes?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid ""
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Pluto-daemonen må kjøre for å kunne støtte versjon 1 av Internet Key "
+"Exchange-protokollen."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Skal strongSwans IKEv2-daemon startes?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Charon-daemonen må kjøre for å kunne støtte versjon 2 av Internet Key "
+"Exchange-protokollen."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Skal det lages et offentlig/privat RSA-nøkkelpar for denne verten?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
+"StrongSwan kan bruke en delt nøkkel (PSK) eller et RSA-nøkkelpar for å "
+"autentisere IPSec-forbindelser til andre verter. RSA-autentisering betraktes "
+"for det meste som sikrere og lettere å administrere. Du kan bruke PSK og RSA-"
+"autentisering samtidig."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
+msgstr ""
+"Hvis du ikke vil lage et nytt offentlig/privat nøkkelpar, så kan du velge å "
+"bruke et eksisterende nøkkelpar i neste steg."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Skal et eksisterende X.509-sertifikat brukes for strongSwan?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid ""
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
+msgstr ""
+"Den informasjonen som trengs kan hentes automatisk fra et eksisterende X.509-"
+"sertifikat med tilhørende privat RSA-nøkkel. Begge deler kan være i én fil, "
+"hvis den er i PEM-format. Du bør velge dette hvis du har et slikt sertifikat "
+"og vil bruke det til å autentisere IPSec-forbindelser."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Filnavn for ditt X.509-sertifikat i PEM-format:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid ""
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
+msgstr ""
+"Oppgi full sti til fila som inneholder ditt X.509-sertifikat i PEM-format."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Filnavn for din eksisterende private X.509-nøkkel i PEM-format:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid ""
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
+msgstr ""
+"Oppgi full sti til fila som inneholder den private nøkkelen som tilsvarer "
+"ditt X.509-sertifikat i PEM-format. Dette kan være den samme fila som X.509-"
+"sertifikatet."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr "RSA nøkkellengde:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+#| msgid ""
+#| "Please enter the length of RSA key you wish to generate. A value of less "
+#| "than  1024 bits is not considered secure. A value of more than 2048 bits "
+#| "will  probably affect performance."
+msgid ""
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
+msgstr ""
+"Oppgi lengde for RSA-nøkkelen du vil opprette. Kortere nøkler enn 1024 bit "
+"betraktes ikke som sikre. En nøkkellengde på mer enn 2048 bit vil antakelig "
+"gå ut over ytelsen."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Skal det lages et selvsignert X.509-sertifikat?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
+"Bare selvsignerte X.509-sertifikater kan lages automatisk, for ellers må en "
+"sertifikatutsteder signere sertifikatsøknaden."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+"Hvis du godtar dette, så kan det sertifikatet som lages bli brukt straks til "
+"å kople til andre IPSec-verter som støtter autentisering via et X.509-"
+"sertifikat. Men om strongSwans PKI-del skal brukes, må det lages en "
+"tillitskjede ved at alle X.509-sertifikatene signeres av en enkelt utsteder."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+#| msgid ""
+#| "If you do not accept this option, only the RSA private key will be "
+#| "created, along with a certificate request which you will need to have "
+#| "signed by a  certificate authority."
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Hvis du ikke godtar dette, så blir bare en privat RSA-nøkkel opprettet, "
+"sammen med en sertifikatsøknad som du må få en sertifikatutsteder til å "
+"signere."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "Country code for the X.509 certificate request:"
+msgstr "Landskode for X.509-sertifikatsøknaden:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid ""
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
+msgstr ""
+"Oppgi tobokstavers ISO3166 landskode som skal brukes i sertifikatsøknaden."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr ""
+"Dette feltet er obligatorisk, uten det kan det ikke lages et sertifikat."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid "State or province name for the X.509 certificate request:"
+msgstr "Stat eller provinsnavn for X.509-sertifikatsøknaden:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid ""
+"Please enter the full name of the state or province to include in the "
+"certificate request."
+msgstr ""
+"Oppgi fullt navn på stat eller provins som skal tas med i sertifikatsøknaden."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Stedsnavn for X.509-sertifikatsøknaden:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid ""
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
+msgstr "Oppgi stedsnavn (ofte en by) som skal brukes i sertifikatsøknaden."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Organisasjonsnavn for X.509-sertifikatsøknaden:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid ""
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
+msgstr ""
+"Oppgi organisasjonsnavn (ofte et firma) som skal brukes i sertifikatsøknaden."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Organisasjonsenhet for X.509-sertifikatsøknaden:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+#| msgid ""
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
+msgid ""
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
+msgstr ""
+"Oppgi organisasjonsenhet (ofte en avdeling som skal brukes i "
+"sertifikatsøknaden."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Vanlig navn for X.509-sertifikatsøknaden:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Oppgi vanlig navn (slik som vertsnavnet på denne maskinen) som skal brukes i "
+"sertifikatsøknaden."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid "Email address for the X.509 certificate request:"
+msgstr "E-postadresse for X.509-sertifikatsøknaden:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid ""
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
+msgstr ""
+"Oppgi e-postadressen (for ansvarlig person eller organisasjon) som skal "
+"brukes i sertifikatsøknaden."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Slå på opportunistisk kryptering?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
+"Denne versjonen av strongSwan støtter opportunistisk kryptering (OE), som "
+"lagrer autentiseringsinformasjon for IPSec i DNS-data. Inntil dette er tatt "
+"i vanlig bruk vil det gi en betydelig forsinkelse for hver ny utgående "
+"tilkobling hvis dette er aktivert."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
+msgstr ""
+"Du bør bare slå på opportunistisk kryptering hvis du er sikker på at du vil "
+"ha det. Det kan koble ut Internett-forbindelsen (standardruten) når pluto."
+"nissen starter."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index d33a981b1..c4f46189b 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: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
+"POT-Creation-Date: 2009-05-25 14:44+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"
@@ -30,90 +30,71 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "\"zo vroeg mogelijk\", \"na NFS\", \"na PCMCIA\""
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
-msgstr "Wanneer moet strongSwan herstarten:"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
 msgstr ""
-"Er zijn drie mogelijkheden wanneer stronSwan kan starten: vóór of na de NFS-"
-"diensten en na de PCMCIA-diensten. Het juiste antwoord is afhankelijk van uw "
-"specifieke installatie."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"Als u uw /usr-boom niet via NFS heeft aangekoppeld (u koppelt enkel andere, "
-"minder vitale bomen via NFS of u gebruikt NFS helemaal niet om bomen aan te "
-"koppelen) en u gebruikt geen PCMCIA-netwerkkaart, dan is het best om "
-"strongSwan zo vroeg mogelijk te starten, dus toe te staan van de NFS-"
-"aankoppelingen te beveiligen door IPSec. In dit geval (of als u deze zaak "
-"niet verstaat of het u niet uitmaakt), antwoord dan \"zo vroeg mogelijk\" op "
-"deze vraag (de standaard)."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Wanneer moet strongSwan herstarten:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
-msgstr ""
-"Als u uw /usr-boom via NFS heeft aangekoppeld en u gebruikt geen PCMCIA-"
-"netwerkkaart, dan zult u strongSwan moeten starten na NFS zodat alle nodige "
-"bestanden aanwezig zijn. In dit geval, antwoord \"na NFS\" op deze vraag. "
-"Merk op dat in dit geval de NFS-aankoppeling van /usr niet kan worden "
-"beveiligd door IPSec."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
-"Als u een PCMCIA-netwerkkaart gebruikt voor uw IPSec-verbindingen, dan hebt "
-"u enkel de keuze om te starten na de PCMCIA-diensten. Antwoord in dit geval "
-"\"na PCMCIA\". Dit is ook het correcte antwoord als u sleutels wilt afhalen "
-"van een lokaal draaiende DNS-server met DNSSec-ondersteuning."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
-msgstr "Wilt u strongSwan herstarten?"
+#: ../strongswan-starter.templates:3001
+#, fuzzy
+#| msgid "When to start strongSwan:"
+msgid "Restart strongSwan now?"
+msgstr "Wanneer moet strongSwan herstarten:"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Restarting strongSwan is a good idea, since if there is a security fix, "
+#| "it will not be fixed until the daemon restarts. Most people expect the "
+#| "daemon to restart, so this is generally a good idea. However this might "
+#| "take down existing connections and then bring them back up."
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
 "strongSwan herstarten is een goed idee omdat als er een "
@@ -125,75 +106,60 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:3001
-#, fuzzy
-msgid "Do you wish to support IKEv1?"
-msgstr "Wilt u strongSwan herstarten?"
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-#, fuzzy
-msgid "Do you wish to support IKEv2?"
-msgstr "Wilt u strongSwan herstarten?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-msgid "Do you want to create a RSA public/private keypair for this host?"
-msgstr "Wilt u een publiek/privaat RSA-sleutelpaar aanmaken voor deze host?"
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
 #, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
+#| msgid "Do you want to create a RSA public/private keypair for this host?"
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Wilt u een publiek/privaat RSA-sleutelpaar aanmaken voor deze host?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
-msgstr ""
-"Deze installatie kan automatisch een publiek/privaat RSA-sleutelpaar "
-"aanmaken voor deze host. Dit sleutelpaar kan worden gebruikt om IPSec-"
-"verbinden naar andere hosts te authenticeren en is de aanbevolen manier om "
-"veilige IPSec-verbindingen op te zetten. De andere mogelijkheid zou zijn om "
-"gedeelde geheimen (wachtwoorden die aan beide kanten van de tunnel hetzelfde "
-"zijn) te gebruiken voor het authenticeren van een verbinding, maar voor een "
-"groter aantal verbindingen is RSA-authenticatie makkelijker te beheren en "
-"veiliger."
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter.templates:6001
 #, fuzzy
 #| msgid ""
 #| "If you do not want to create a new public/private keypair, you can choose "
@@ -207,17 +173,17 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
 #| msgid "Do you have an existing X509 certificate file for strongSwan?"
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid "Use an existing X.509 certificate for strongSwan?"
 msgstr ""
 "Hebt u een bestaand X509-certificaatbestand dat u voor strongSwan wilt "
 "gebruiken?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
 #| msgid ""
 #| "This installer can automatically extract the needed information from an "
@@ -226,11 +192,11 @@ msgstr ""
 #| "certificate and key file and want to use it for authenticating IPSec "
 #| "connections, then please answer yes."
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
 "Deze installatie kan de benodigde informatie automatisch extraheren van een "
 "bestaand X509-certificaat met een bijhorende private RSA-sleutel. Beide "
@@ -240,7 +206,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter.templates:8001
 #, fuzzy
 #| msgid "File name of your X509 certificate in PEM format:"
 msgid "File name of your X.509 certificate in PEM format:"
@@ -248,7 +214,7 @@ msgstr "Bestandsnaam van uw X509-certificaat in PEM-formaat:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter.templates:8001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing your X509  "
@@ -262,15 +228,15 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
 #| msgid "File name of your X509 private key in PEM format:"
-msgid "File name of your X.509 private key in PEM format:"
+msgid "File name of your existing X.509 private key in PEM format:"
 msgstr "Bestandsnaam van uw private X509-sleutel in PEM-formaat:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing the private RSA key "
@@ -278,8 +244,8 @@ msgstr "Bestandsnaam van uw private X509-sleutel in PEM-formaat:"
 #| "that contains the X509 certificate."
 msgid ""
 "Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
 "Geef de volledige locatie van het bestand dat uw private RSA-sleutel bevat "
 "die behoort bij uw X509-certificaat in PEM-formaat. Dit kan hetzelfde "
@@ -287,72 +253,48 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
-msgstr "Lengte van de aangemaakte RSA-sleutel (in bits):"
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
-#, 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."
+#: ../strongswan-starter.templates:10001
 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."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"Geef de lengte van de aangemaakte RSA-sleutel. Het mag niet minder dan 1024 "
-"bits zijn omdat dit als onveilig wordt beschouwd en u zult waarschijnlijk "
-"niet meer dan 2048 bits nodig hebben omdat het enkel het authenticatieproces "
-"vertraagt en op dit moment niet nodig is."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
 #, fuzzy
 #| msgid "Do you want to create a self-signed X509 certificate?"
-msgid "Do you want to create a self-signed X.509 certificate?"
+msgid "Create a self-signed X.509 certificate?"
 msgstr "Wilt u een door uzelf getekend X509-certificaat aanmaken?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid ""
-#| "This installer can only create self-signed X509 certificates "
-#| "automatically, because otherwise a certificate authority is needed to "
-#| "sign the certificate request. If you want to create a self-signed "
-#| "certificate, you can use it immediately to connect to other IPSec hosts "
-#| "that support X509 certificate for authentication of IPSec connections. "
-#| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
-#| "you will need to have all X509 certificates signed by a single "
-#| "certificate authority to create a trust path."
+#: ../strongswan-starter.templates:11001
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
-msgstr ""
-"Deze installatie kan enkel een door uzelf getekend X509-certificaat "
-"automatischaanmaken omdat anders een certificaatautoriteit nodig is om de "
-"certificaataanvraag te tekenen. Als u een door uzelf getekend certificaat "
-"wilt aanmaken, dan kunt u het onmiddellijk gebruiken om een verbinding te "
-"leggen met andere IPSec-hosts die X509-certificaten ondersteunen voor IPSec-"
-"verbindingen. Hoewel, als u de nieuwe PKI-mogelijkheden wilt gebruiken van "
-"strongSwan >= 1.91, dan zult u alle X509-certificaten moeten laten tekenen "
-"door één enkele certificaatautoriteit om een vertrouwenspad aan te maken."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
 #, fuzzy
 #| msgid ""
 #| "If you do not want to create a self-signed certificate, then this "
@@ -360,10 +302,9 @@ msgstr ""
 #| "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 get the certificate request signed by your certificate "
-"authority."
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"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 "
@@ -372,7 +313,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter.templates:12001
 #, fuzzy
 #| msgid "Country code for the X509 certificate request:"
 msgid "Country code for the X.509 certificate request:"
@@ -380,35 +321,27 @@ msgstr "Landcode van de X509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter.templates:12001
+#, fuzzy
+#| msgid ""
+#| "Please enter the 2 letter country code for your country. This code will "
+#| "be placed in the certificate request."
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
 "Geef de 2-letterige landcode voor uw land. Deze code zal in de "
 "certificaataanvraag worden geplaatst."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
-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."
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
 msgstr ""
-"U moet hier wel een geldige landcode opgeven omdat openssl anders zal "
-"weigeren om een certificaat aan te maken. Er is voor elke veld van het X509-"
-"certificaat een leeg veld toegestaan, maar niet voor dit veld."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Voorbeeld: BE"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter.templates:13001
 #, fuzzy
 #| msgid "State or province name for the X509 certificate request:"
 msgid "State or province name for the X.509 certificate request:"
@@ -416,23 +349,21 @@ msgstr "Staat of provincie voor de X509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter.templates:13001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full name of the state or province you live in. This "
+#| "name will be placed in the certificate request."
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
 "Geef de volledige naam van de staat of provincie waarin u woont. Deze naam "
 "zal in de certificaataanvraag worden geplaatst."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "Voorbeeld: Limburg"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter.templates:14001
 #, fuzzy
 #| msgid "Locality name for the X509 certificate request:"
 msgid "Locality name for the X.509 certificate request:"
@@ -440,23 +371,21 @@ msgstr "Plaatsnaam voor de X509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter.templates:14001
+#, fuzzy
+#| msgid ""
+#| "Please enter the locality (e.g. city) where you live. This name will be "
+#| "placed in the certificate request."
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
 "Geef de plaatsnaam (v.b. stad) waar u woont. Deze naam zal in de "
 "certificaataanvraag worden geplaatst."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Voorbeeld: Genk"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter.templates:15001
 #, fuzzy
 #| msgid "Organization name for the X509 certificate request:"
 msgid "Organization name for the X.509 certificate request:"
@@ -464,28 +393,22 @@ msgstr "Naam van de organisatie voor de X509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter.templates:15001
 #, fuzzy
 #| 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."
+#| "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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Geef de organisatie (v.b. bedrijf) waarvoor het X509-certificaat wordt "
-"aangemaakt. Deze naam zal in de certicicaataanvraag worden geplaatst."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Voorbeeld: Debian"
+"Geef de organisatie-eenheid (v.b. dienst) waarvoor het X509-certificaat "
+"wordt aangemaakt. Deze naam zal in de certificaataanvraag worden geplaatst."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter.templates:16001
 #, fuzzy
 #| msgid "Organizational unit for the X509 certificate request:"
 msgid "Organizational unit for the X.509 certificate request:"
@@ -493,29 +416,22 @@ msgstr "Organisatie-eenheid voor de X509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter.templates:16001
 #, fuzzy
 #| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
 "Geef de organisatie-eenheid (v.b. dienst) waarvoor het X509-certificaat "
 "wordt aangemaakt. Deze naam zal in de certificaataanvraag worden geplaatst."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Voorbeeld: dienst veiligheid"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter.templates:17001
 #, fuzzy
 #| msgid "Common name for the X509 certificate request:"
 msgid "Common name for the X.509 certificate request:"
@@ -523,16 +439,15 @@ msgstr "Naam voor de X509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter.templates:17001
 #, fuzzy
 #| 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."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
 msgstr ""
 "Geef de naam (v.b. computernaam van deze machine) waarvoor het X509-"
 "certificaat wordt aangemaakt. Deze naam zal in de certificaataanvraag worden "
@@ -540,13 +455,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Voorbeeld: gateway.debian.org"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 #, fuzzy
 #| msgid "Email address for the X509 certificate request:"
 msgid "Email address for the X.509 certificate request:"
@@ -554,16 +463,15 @@ msgstr "E-mailadres voor de X509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 #, fuzzy
 #| 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 "
 #| "certificate request."
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
 "Geef het e-mailadres van de persoon of organisatie die verantwoordelijk is "
 "voor het X509-certificaat. Dit adres zal in de certificaataanvraag worden "
@@ -571,40 +479,238 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+#: ../strongswan-starter.templates:19001
+#, fuzzy
+#| msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+msgid "Enable opportunistic encryption?"
 msgstr "Wilt u opportunistische encryptie aanschakelen in strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
-msgstr ""
-"strongSwan heeft ondersteuning voor opportunistische encryptie (OE) die "
-"IPSec-authenticatie-informatie (v.b. publieke RSA-sleutels) bewaart in "
-"(liefst veilige) DNS-records. Totdat dit veelvuldig wordt toegepast zal dit "
-"activeren een significante vertraging veroorzaken voor elke nieuwe uitgaande "
-"verbinding. Omdat versie 2.0 van strongSwan standaard OE heeft "
-"aangeschakeld, wordt dus waarschijnlijk uw bestaande verbinding met het "
-"Internet (v.b. uw standaard route) verbroken vanaf dat pluto (de strongSwan-"
-"sleutelringachtergronddienst) wordt gestart."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"Kiest of u OE-ondersteuning wilt aanschakelen. Indien onzeker, schakel het "
-"dan niet aan."
+
+#~ msgid "earliest, \"after NFS\", \"after PCMCIA\""
+#~ msgstr "\"zo vroeg mogelijk\", \"na NFS\", \"na PCMCIA\""
+
+#~ msgid ""
+#~ "There are three possibilities when strongSwan can start: before or after "
+#~ "the NFS services and after the PCMCIA services. The correct answer "
+#~ "depends on your specific setup."
+#~ msgstr ""
+#~ "Er zijn drie mogelijkheden wanneer stronSwan kan starten: vóór of na de "
+#~ "NFS-diensten en na de PCMCIA-diensten. Het juiste antwoord is afhankelijk "
+#~ "van uw specifieke installatie."
+
+#~ msgid ""
+#~ "If you do not have your /usr tree mounted via NFS (either you only mount "
+#~ "other, less vital trees via NFS or don't use NFS mounted trees at all) "
+#~ "and don't use a PCMCIA network card, then it's best to start strongSwan "
+#~ "at the earliest possible time, thus allowing the NFS mounts to be secured "
+#~ "by IPSec. In this case (or if you don't understand or care about this "
+#~ "issue), answer \"earliest\" to this question (the default)."
+#~ msgstr ""
+#~ "Als u uw /usr-boom niet via NFS heeft aangekoppeld (u koppelt enkel "
+#~ "andere, minder vitale bomen via NFS of u gebruikt NFS helemaal niet om "
+#~ "bomen aan te koppelen) en u gebruikt geen PCMCIA-netwerkkaart, dan is het "
+#~ "best om strongSwan zo vroeg mogelijk te starten, dus toe te staan van de "
+#~ "NFS-aankoppelingen te beveiligen door IPSec. In dit geval (of als u deze "
+#~ "zaak niet verstaat of het u niet uitmaakt), antwoord dan \"zo vroeg "
+#~ "mogelijk\" op deze vraag (de standaard)."
+
+#~ msgid ""
+#~ "If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
+#~ "card, then you will need to start strongSwan after NFS so that all "
+#~ "necessary files are available. In this case, answer \"after NFS\" to this "
+#~ "question. Please note that the NFS mount of /usr can not be secured by "
+#~ "IPSec in this case."
+#~ msgstr ""
+#~ "Als u uw /usr-boom via NFS heeft aangekoppeld en u gebruikt geen PCMCIA-"
+#~ "netwerkkaart, dan zult u strongSwan moeten starten na NFS zodat alle "
+#~ "nodige bestanden aanwezig zijn. In dit geval, antwoord \"na NFS\" op deze "
+#~ "vraag. Merk op dat in dit geval de NFS-aankoppeling van /usr niet kan "
+#~ "worden beveiligd door IPSec."
+
+#~ msgid ""
+#~ "If you use a PCMCIA network card for your IPSec connections, then you "
+#~ "only have to choose to start it after the PCMCIA services. Answer \"after "
+#~ "PCMCIA\" 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 ""
+#~ "Als u een PCMCIA-netwerkkaart gebruikt voor uw IPSec-verbindingen, dan "
+#~ "hebt u enkel de keuze om te starten na de PCMCIA-diensten. Antwoord in "
+#~ "dit geval \"na PCMCIA\". Dit is ook het correcte antwoord als u sleutels "
+#~ "wilt afhalen van een lokaal draaiende DNS-server met DNSSec-ondersteuning."
+
+#~ msgid "Do you wish to restart strongSwan?"
+#~ msgstr "Wilt u strongSwan herstarten?"
+
+#, fuzzy
+#~ msgid "Do you wish to support IKEv1?"
+#~ msgstr "Wilt u strongSwan herstarten?"
+
+#, fuzzy
+#~ msgid "Do you wish to support IKEv2?"
+#~ msgstr "Wilt u strongSwan herstarten?"
+
+#, fuzzy
+#~| msgid ""
+#~| "This installer can automatically create a RSA public/private keypair for "
+#~| "this host. This keypair can be used to authenticate IPSec connections to "
+#~| "other hosts and is the preferred way for building up secure IPSec "
+#~| "connections. The other possibility would be to use shared secrets "
+#~| "(passwords that are the same on both sides of the tunnel) for "
+#~| "authenticating an connection, but for a larger number of connections RSA "
+#~| "authentication is easier to administer and more secure."
+#~ msgid ""
+#~ "This installer can automatically create a RSA public/private keypair with "
+#~ "an X.509 certificate for this host. This can be used to authenticate  "
+#~ "IPSec connections to other hosts and is the preferred way for building "
+#~ "up  secure IPSec connections. The other possibility would be to use pre-"
+#~ "shared  secrets (PSKs, passwords that are the same on both sides of the "
+#~ "tunnel) for authenticating an connection, but for a larger number of "
+#~ "connections RSA authentication is easier to administer and more secure. "
+#~ "Note that having a keypair allows to use both X.509 and PSK "
+#~ "authentication for IPsec  tunnels."
+#~ msgstr ""
+#~ "Deze installatie kan automatisch een publiek/privaat RSA-sleutelpaar "
+#~ "aanmaken voor deze host. Dit sleutelpaar kan worden gebruikt om IPSec-"
+#~ "verbinden naar andere hosts te authenticeren en is de aanbevolen manier "
+#~ "om veilige IPSec-verbindingen op te zetten. De andere mogelijkheid zou "
+#~ "zijn om gedeelde geheimen (wachtwoorden die aan beide kanten van de "
+#~ "tunnel hetzelfde zijn) te gebruiken voor het authenticeren van een "
+#~ "verbinding, maar voor een groter aantal verbindingen is RSA-authenticatie "
+#~ "makkelijker te beheren en veiliger."
+
+#~ msgid "The length of the created RSA key (in bits):"
+#~ msgstr "Lengte van de aangemaakte RSA-sleutel (in bits):"
+
+#, 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 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."
+#~ msgstr ""
+#~ "Geef de lengte van de aangemaakte RSA-sleutel. Het mag niet minder dan "
+#~ "1024 bits zijn omdat dit als onveilig wordt beschouwd en u zult "
+#~ "waarschijnlijk niet meer dan 2048 bits nodig hebben omdat het enkel het "
+#~ "authenticatieproces vertraagt en op dit moment niet nodig is."
+
+#, fuzzy
+#~| msgid ""
+#~| "This installer can only create self-signed X509 certificates "
+#~| "automatically, because otherwise a certificate authority is needed to "
+#~| "sign the certificate request. If you want to create a self-signed "
+#~| "certificate, you can use it immediately to connect to other IPSec hosts "
+#~| "that support X509 certificate for authentication of IPSec connections. "
+#~| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~| "you will need to have all X509 certificates signed by a single "
+#~| "certificate authority to create a trust path."
+#~ msgid ""
+#~ "This installer can only create self-signed X.509 certificates "
+#~ "automatically, because otherwise a certificate authority is needed to "
+#~ "sign the certificate request. If you want to create a self-signed "
+#~ "certificate, you can use it immediately to connect to other IPSec hosts "
+#~ "that support X.509 certificate for authentication of IPSec connections. "
+#~ "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~ "you will need to have all X.509 certificates signed by a single "
+#~ "certificate authority to create a trust path."
+#~ msgstr ""
+#~ "Deze installatie kan enkel een door uzelf getekend X509-certificaat "
+#~ "automatischaanmaken omdat anders een certificaatautoriteit nodig is om de "
+#~ "certificaataanvraag te tekenen. Als u een door uzelf getekend certificaat "
+#~ "wilt aanmaken, dan kunt u het onmiddellijk gebruiken om een verbinding te "
+#~ "leggen met andere IPSec-hosts die X509-certificaten ondersteunen voor "
+#~ "IPSec-verbindingen. Hoewel, als u de nieuwe PKI-mogelijkheden wilt "
+#~ "gebruiken van strongSwan >= 1.91, dan zult u alle X509-certificaten "
+#~ "moeten laten tekenen door één enkele certificaatautoriteit om een "
+#~ "vertrouwenspad aan te maken."
+
+#~ 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 ""
+#~ "U moet hier wel een geldige landcode opgeven omdat openssl anders zal "
+#~ "weigeren om een certificaat aan te maken. Er is voor elke veld van het "
+#~ "X509-certificaat een leeg veld toegestaan, maar niet voor dit veld."
+
+#~ msgid "Example: AT"
+#~ msgstr "Voorbeeld: BE"
+
+#~ msgid "Example: Upper Austria"
+#~ msgstr "Voorbeeld: Limburg"
+
+#~ msgid "Example: Vienna"
+#~ msgstr "Voorbeeld: Genk"
+
+#, fuzzy
+#~| 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."
+#~ msgid ""
+#~ "Please enter the organization (e.g. company) that the X.509 certificate "
+#~ "should be created for. This name will be placed in the certificate "
+#~ "request."
+#~ msgstr ""
+#~ "Geef de organisatie (v.b. bedrijf) waarvoor het X509-certificaat wordt "
+#~ "aangemaakt. Deze naam zal in de certicicaataanvraag worden geplaatst."
+
+#~ msgid "Example: Debian"
+#~ msgstr "Voorbeeld: Debian"
+
+#~ msgid "Example: security group"
+#~ msgstr "Voorbeeld: dienst veiligheid"
+
+#~ msgid "Example: gateway.debian.org"
+#~ msgstr "Voorbeeld: gateway.debian.org"
+
+#~ msgid ""
+#~ "strongSwan comes with support for opportunistic encryption (OE), which "
+#~ "stores IPSec authentication information (i.e. RSA public keys) in "
+#~ "(preferably secure) DNS records. Until this is widely deployed, "
+#~ "activating it will cause a significant slow-down for every new, outgoing "
+#~ "connection. Since version 2.0, strongSwan upstream comes with OE enabled "
+#~ "by default and is thus likely to break your existing connection to the "
+#~ "Internet (i.e. your default route) as soon as pluto (the strongSwan "
+#~ "keying daemon) is started."
+#~ msgstr ""
+#~ "strongSwan heeft ondersteuning voor opportunistische encryptie (OE) die "
+#~ "IPSec-authenticatie-informatie (v.b. publieke RSA-sleutels) bewaart in "
+#~ "(liefst veilige) DNS-records. Totdat dit veelvuldig wordt toegepast zal "
+#~ "dit activeren een significante vertraging veroorzaken voor elke nieuwe "
+#~ "uitgaande verbinding. Omdat versie 2.0 van strongSwan standaard OE heeft "
+#~ "aangeschakeld, wordt dus waarschijnlijk uw bestaande verbinding met het "
+#~ "Internet (v.b. uw standaard route) verbroken vanaf dat pluto (de "
+#~ "strongSwan-sleutelringachtergronddienst) wordt gestart."
+
+#~ msgid ""
+#~ "Please choose whether you want to enable support for OE. If unsure, do "
+#~ "not enable it."
+#~ msgstr ""
+#~ "Kiest of u OE-ondersteuning wilt aanschakelen. Indien onzeker, schakel "
+#~ "het dan niet aan."
 
 #~ msgid "x509, plain"
 #~ msgstr "x509, gewoon"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index cd940099c..3fd432591 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,623 +1,449 @@
-# Portuguese translation of strongswan's debconf messages.
-# Copyright (C) 2007
+# translation of strongswan debconf to Portuguese
+# Copyright (C) 2007 the strongswan's copyright holder
 # This file is distributed under the same license as the strongswan package.
-# Luísa Lourenço <kikentai@gmail.com>, 2007.
 #
+# Luísa Lourenço <kikentai@gmail.com>, 2007.
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: strongswan 2.8.3-1\n"
+"Project-Id-Version: strongswan 4.2.14-2\n"
 "Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
-"PO-Revision-Date: 2007-09-30 15:02+0100\n"
-"Last-Translator: Luísa Lourenço <kikentai@gmail.com>\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 14:59+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "o mais cedo possível, \"depois do NFS\", \"depois do PCMCIA\""
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "mais cedo"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
-msgstr "Quando iniciar o strongSwan:"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "após NFS"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
-msgstr ""
-"Existem três possibilidades para iniciar o strongSwan: antes ou depois dos "
-"serviços NFS e depois dos serviços PCMCIA. A resposta correcta depende da "
-"sua configuração."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "após PCMCIA"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"Se não tem a sua estrutura /usr montada via NFS (ou apenas outras estruturas "
-"montadas, menos vitais, via NFS ou não usa de todo o NFS para estruturas "
-"montadas) e não usar uma placa de rede PCMCIA, então é melhor iniciar o "
-"strongSwan o mais cedo possível. Permitindo assim aos pontos de montagem NFS "
-"serem protegidos por 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 (é o "
-"escolha pré-definida)."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Quando se deve iniciar o strongSwan:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
 msgstr ""
-"Se tem o sua estrutura /usr montada via NFS e não usa uma placa de rede "
-"PCMCIA, então necessita iniciar o strongSwan depois do NFS para que todos os "
-"ficheiros necessários estejam disponíveis. Neste caso, responda \"depois do "
-"NFS\" a esta questão. Por favor note que, neste caso, o mount NFS do /usr "
-"não pode ser segurado pelo IPSec."
+"O strongSwan arranca durante o arranque do sistema para que possa proteger "
+"os sistemas de ficheiros que são montados automaticamente."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   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."
+" * mais cedo: se o /usr não for montado através de NFS e você não usa uma\n"
+"   placa de rede PCMCIA, é melhor arrancar o strongSwan o mais cedo "
+"possível,\n"
+"   para que as montagens NFS sejam seguras por IPSec;\n"
+" * após NFS: recomendado quando o /usr é montado através de NFS e nenhuma\n"
+"   placa de rede PCMCIA é usada;\n"
+" * após PCMCIA: recomendado se a ligação IPSec usa uma placa de rede PCMCIA\n"
+"   ou se necessita que sejam obtidas chaves a partir dum servidor DNS que\n"
+"   corre localmente com suporte a DNSSec."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
-msgstr "Deseja reiniciar o strongSwan?"
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Reiniciar agora o strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
-"Reiniciar o strongSwan é boa ideia, visto que se houver uma correcção de "
-"segurança, não irá ser aplicada até o daemon reiniciar. A maioria das "
-"pessoas espera que o daemon reinicie, por isso isto é geralmente uma boa "
-"ideia. No entanto isto poderá deitar abaixo ligações existentes e depois "
-"ligar de novo."
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates:3001
-msgid "Do you wish to support IKEv1?"
-msgstr "Deseja suporte para o IKEv1?"
+"É recomendado reiniciar o strongSwan, porque se existir uma correcção de "
+"segurança, esta não será aplicada até que o daemon seja reiniciado. No "
+"entanto isto poderá fechar ligações existentes e depois ligá-las de novo."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:3001
+#| msgid ""
+#| "If you don't restart strongSwan now, you should do so manually at the "
+#| "first  opportunity."
 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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
-"O strongSwan suporta ambas as versões do protocolo Internet Key Exchange, "
-"IKEv1 e IKEv2. Deseja iniciar o daemon \"pluto\" para suporte ao IKEv1 "
-"quando o strongSwan for iniciado?"
+"Se você não reiniciar o strongSwan agora, deve fazê-lo manualmente na "
+"primeira oportunidade."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-msgid "Do you wish to support IKEv2?"
-msgstr "Deseja suporte para o IKEv2?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Iniciar o daemon IKEv1 do strongSwan?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"O strongSwan suporta ambas as versões do protocolo Internet Key Exchange, "
-"IKEv1 e IKEv2. Deseja iniciar o daemon \"charon\" para suporte ao IKEv2 "
-"quando o strongSwan for iniciado?"
+"O daemon pluto precisa de estar a funcionar para suportar a versão 1 do "
+"protocolo Internet Key Exchange."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Iniciar o daemon IKEv2 do strongSwan?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
 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."
+"O daemon charon precisa de estar a funcionar para suportar a versão 2 do "
+"protocolo Internet Key Exchange."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "If you do not want to create a new public/private keypair, you can choose "
-#| "to use an existing one."
-msgid ""
-"If you do not want to create a new public/private keypair, you can choose to "
-"use an existing one in the next step."
-msgstr ""
-"Se não quiser criar um novo par de chaves pública/privada, pode escolher "
-"usar um já existente."
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Criar um par de chaves pública/privada RSA para esta máquina?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid "Do you have an existing X509 certificate file for strongSwan?"
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
-msgstr "Tem um ficheiro de certificado X509 existente para o strongSwan?"
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
+"O strongSwan pode usar uma chave Pré-Partilhada (PSK) ou um par de chaves "
+"RSA para autenticar ligações IPSec a outras máquinas. A autenticação RSA é "
+"geralmente considerada mais segura e mais fácil de administrar. Você pode "
+"usar autenticação PSK e RSA em simultâneo."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically extract the needed information from an "
-#| "existing X509 certificate with a matching RSA private key. Both parts can "
-#| "be in one file, if it is in PEM format. If you have such an existing "
-#| "certificate and key file and want to use it for authenticating IPSec "
-#| "connections, then please answer yes."
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
 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."
+"Se não quiser criar um novo par de chaves pública/privada, pode escolher "
+"usar um já existente no próximo passo."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, fuzzy
-#| msgid "File name of your X509 certificate in PEM format:"
-msgid "File name of your X.509 certificate in PEM format:"
-msgstr "Nome de ficheiro para o seu certificado X509 em formato PEM:"
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Usar um certificado X.509 existente para o strongSwan?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, 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 X.509 certificate "
-"in PEM format."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
-"Por favor insira a localização completa do ficheiro que contém o seu "
-"certificado X509 em formato PEM."
+"A informação necessária pode ser extraída automaticamente de um certificado "
+"X.509 existente com uma chave RSA privada coincidente. Ambas as partes podem "
+"estar num ficheiro, se estiver no formato PEM. iDeve escolher esta opção se "
+"tiver tal ficheiro de certificado e chave existente e quiser usá-lo para "
+"autenticar ligações IPSec."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| msgid "File name of your X509 private key in PEM format:"
-msgid "File name of your X.509 private key in PEM format:"
-msgstr "Nome do ficheiro da sua chave privada X509 em formato PEM:"
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Nome de ficheiro do seu certificado X.509 em formato PEM:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| 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 contains the X509 certificate."
 msgid ""
-"Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
 msgstr ""
-"Por favor insira a localização completa do ficheiro que contém a chave "
-"privada RSA que coincide com o seu certificado X509 em formato PEM. Este "
-"pode ser o mesmo ficheiro que contém o certificado X509."
+"Por favor insira a localização completa do ficheiro que contém o seu "
+"certificado X.509 em formato PEM."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
-msgstr "O tamanho da chave RSA criada (em bits):"
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Nome do ficheiro da sua chave privada X.509 existente em formato PEM:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
 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."
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
-"Por favor insira o tamanho da chave RSA criada. Não deve ser menos do que "
-"1024 bits porque seria considerada insegura e não irá provavelmente "
-"necessitar de mais do que 2048 bits porque só torna o processo de "
-"autenticação mais lento e não é necessário de momento."
+"Por favor insira a localização completa do ficheiro que contém a chave "
+"privada RSA que coincide com o seu certificado X.509 em formato PEM. Este "
+"pode ser o mesmo ficheiro do certificado X.509."
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid "Do you want to create a self-signed X509 certificate?"
-msgid "Do you want to create a self-signed X.509 certificate?"
-msgstr "Deseja criar um certificado X509 auto-assinado?"
+msgid "RSA key length:"
+msgstr "Comprimento da chave RSA:"
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
 #| msgid ""
-#| "This installer can only create self-signed X509 certificates "
-#| "automatically, because otherwise a certificate authority is needed to "
-#| "sign the certificate request. If you want to create a self-signed "
-#| "certificate, you can use it immediately to connect to other IPSec hosts "
-#| "that support X509 certificate for authentication of IPSec connections. "
-#| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
-#| "you will need to have all X509 certificates signed by a single "
-#| "certificate authority to create a trust path."
+#| "Please enter the length of RSA key you wish to generate. A value of less "
+#| "than  1024 bits is not considered secure. A value of more than 2048 bits "
+#| "will  probably affect performance."
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"Este instalador só pode criar automaticamente certificados X509 auto-"
-"assinados, porque de outra forma seria necessária uma autoridade de "
-"certificados para assinar o pedido de certificado. Se quiser criar um "
-"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."
+"Por favor indique o comprimento da chave RSA que deseja gerar. Um valor "
+"menor que 1024 bits não é considerado seguro. Um valor maior que 2048 bits "
+"irá provavelmente afectar as performance."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-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 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 ter "
-"o pedido de certificado assinado pela sua autoridade de certificados."
-
-#. Type: string
-#. Description
 #: ../strongswan-starter.templates:11001
-#, fuzzy
-#| msgid "Country code for the X509 certificate request:"
-msgid "Country code for the X.509 certificate request:"
-msgstr "Código de país para o pedido de certificado X509:"
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Criar um certificado X.509 auto-assinado?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
 msgstr ""
-"Por favor insira o código do país, de 2 letras, correspondente ao seu país. "
-"Este código será colocado no pedido de certificado."
+"Apenas certificados X.509 auto-assinados podem ser gerados automaticamente, "
+"porque de outro modo é necessário uma autoridade de certificados para "
+"assinar o pedido de certificado."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 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."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
 msgstr ""
-"Tem mesmo de inserir aqui um código de país válido, porque o openssl irá "
-"recusar gerar certificados sem um. Um campo vazio é permitido para qualquer "
-"outro campo do certificado X.509, mas não para este."
+"Se aceitar esta opção, o certificado criado pode ser usado imediatamente "
+"para ligar a outros máquinas IPSec que suportam autenticação através de um "
+"certificado X.509. No entanto, usar as funcionalidades PKI do strongSwan "
+"necessita que um caminho de confiança seja criado ao ter todos os "
+"certificados X.509 assinados por uma única autoridade."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Exemplo: PT"
+#| msgid ""
+#| "If you do not accept this option, only the RSA private key will be "
+#| "created, along with a certificate request which you will need to have "
+#| "signed by a  certificate authority."
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Se não aceitar esta opção, apenas será criada a chave RSA privada, "
+"juntamente com um pedido de certificado o qual precisa de estar assinado por "
+"uma autoridade de certificados."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-#, fuzzy
-#| msgid "State or province name for the X509 certificate request:"
-msgid "State or province name for the X.509 certificate request:"
-msgstr "Estado ou nome da província para o pedido do certificado X509:"
+msgid "Country code for the X.509 certificate request:"
+msgstr "Código de país para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
-"Por favor insira o nome completo do estado ou província em que vive. Este "
-"nome será colocado no pedido de certificado."
+"Por favor insira o código de país ISO3166 de 2 letras que será usado no "
+"pedido de certificado."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "Exemplo: Trás-os-Montes"
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr ""
+"Este campo é obrigatório: de outro modo não se pode gerar um certificado."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
-#, fuzzy
-#| msgid "Locality name for the X509 certificate request:"
-msgid "Locality name for the X.509 certificate request:"
-msgstr "Nome da localidade para o pedido de certificado X509:"
+msgid "State or province name for the X.509 certificate request:"
+msgstr "Estado ou nome da província para o pedido do certificado X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
-"Por favor insira a localidade (ex. cidade) onde vive. Este nome irá ser "
-"colocado no pedido de certificado."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Exemplo: Vila Real"
+"Por favor insira o nome completo do estado ou província a incluir no pedido "
+"de certificado."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| msgid "Organization name for the X509 certificate request:"
-msgid "Organization name for the X.509 certificate request:"
-msgstr "Nome da organização para o pedido de certificado X509:"
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Nome da localidade para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
-"Por favor insira a organização (ex. firma) para o qual o certificado X509 "
-"deve ser criado. Este nome irá ser colocado no pedido de certificado."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Exemplo: Debian"
+"Por favor insira a localidade (geralmente uma cidade) que deverá ser usada "
+"no pedido de certificado."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| msgid "Organizational unit for the X509 certificate request:"
-msgid "Organizational unit for the X.509 certificate request:"
-msgstr "Unidade da organização para o pedido de certificado X509:"
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Nome da organização para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Por favor insira a unidade da organização (ex. departamento) para o qual o "
-"certificado X509 deve ser criado. Este nome irá ser colocado no pedido de "
-"certificado."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Exemplo: grupo de segurança"
+"Por favor insira o nome da organização (geralmente uma companhia) que deverá "
+"ser usado no pedido de certificado."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-#| msgid "Common name for the X509 certificate request:"
-msgid "Common name for the X.509 certificate request:"
-msgstr "Nome comum para o pedido de certificado X509:"
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Unidade organizativa para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
 #| 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."
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
-"Por favor insira o nome comum (ex. o nome desta máquina) para o qual o "
-"certificado X509 deve ser criado. Este nome irá ser colocado no pedido de "
-"certificado."
+"Por favor insira o nome da unidade organizativa (geralmente um departamento) "
+"que deverá ser usado no pedido de certificado."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Exemplo: gateway.debian.org"
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Nome comum para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:17001
-#, fuzzy
-#| msgid "Email address for the X509 certificate request:"
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Por favor insira o nome comum (tal como o nome desta máquina) que deverá ser "
+"usado no pedido de certificado."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
 msgid "Email address for the X.509 certificate request:"
-msgstr "Endereço de email para o pedido de certificado X509:"
+msgstr "Endereço de email para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
-#, fuzzy
-#| 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 "
-#| "certificate request."
+#: ../strongswan-starter.templates:18001
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
-"Por favor insira o endereço de email da pessoa ou organização que é "
-"responsável pelo certificado X509. Este endereço irá ser colocado no pedido "
-"de certificado."
+"Por favor insira o endereço de email (da pessoa ou organização responsável) "
+"que deverá ser usado no pedido de certificado."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
-msgstr "Deseja activar encriptação oportunística no strongSwan?"
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Activar encriptação oportunista?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
 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 "
-"existente à internet (i.e a sua rota por omissão) assim que o pluto (o "
-"keying daemon do strongSwan) for iniciado."
+"Esta versão do strongSwan suporta encriptação oportunista (OE), a qual "
+"guarda informação de autenticação IPSec em registos DNS. Até que isto esteja "
+"amplamente instalado, a sua activação irá causar um atraso significante em "
+"cada nova ligação de saída."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"Por favor escolha se quer activar ou não o suporte para OE. Se não tiver a "
-"certeza, não o active."
-
-#~ msgid "x509, plain"
-#~ msgstr "x509, simples"
-
-#~ msgid "The type of RSA keypair to create:"
-#~ msgstr "O tipo de par de chaves RSA a criar:"
-
-#~ 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."
-
-#~ 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 "
-#~ "want to connect to other IPSec implementations, you will need a X509 "
-#~ "certificate. It is also possible to create a X509 certificate here and "
-#~ "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 "
-#~ "de 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."
-
-#~ 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 "
-#~ "certificate and its use in strongSwan anyway."
-#~ msgstr ""
-#~ "Assim sendo um certificado X509 é recomendado visto ser mais flexível e "
-#~ "este instalador deve ser capaz de esconder a criação complexa do "
-#~ "certificado X509 e o seu uso no strongSwan de qualquer das maneiras."
+"Você deverá apenas activar a encriptação oportunista se tiver a certeza que "
+"a quer. Pode quebrar a ligação à Internet (rota predefinida) assim que o "
+"daemon pluto arrancar."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 27d6bb0e0..deee74bf4 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: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
+"POT-Creation-Date: 2009-05-25 14:44+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"
@@ -25,99 +25,66 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "o quando antes, \"depois do NFS\", \"depois do PCMCIA\""
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-#, fuzzy
-msgid "When to start strongSwan:"
-msgstr "Voc� deseja reiniciar o Openswan ?"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-#, fuzzy
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
 msgstr ""
-"Com os n�veis de inicializa��o atuais do Debian (quase todos os servi�os "
-"iniciando no n�vel 20) � imposs�vel para o Openswan sempre iniciar no "
-"momento correto. Existem tr�s possibilidades para quando iniciar o "
-"Openswan : antes ou depois dos servi�os NFS e depois dos servi�os PCMCIA. A "
-"resposta correta depende se sua configura��o espec�fica."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 #, fuzzy
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"Caso voc� n�o possua sua �rvore /usr montada via NFS (voc� somente monta "
-"outras �rvores n�o vitais via NFS ou n�o usa �rvores montadas via NFS) e n�o "
-"use um cart�o de rede PCMCIA, a melhor op��o � iniciar o Openswan o quando "
-"antes, permitindo dessa forma que os pontos de montagem NFS estejam "
-"protegidos por IPSec. Nesse caso (ou caso voc� n�o compreenda ou n�o se "
-"importe com esse problema), responda \"o quando antes\" para esta pergunta "
-"(o que � o padr�o)."
+msgid "When to start strongSwan:"
+msgstr "Voc� deseja reiniciar o Openswan ?"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-#, fuzzy
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
-msgstr ""
-"Caso voc� possua sua �rvore /usr montada via NFS e n�o use um cart�o de rede "
-"PCMCIA, voc� precisar� iniciar o Openswan depois do NFS de modo que todos os "
-"arquivos necess�rios estejam dispon�veis. Nesse caso, responda \"depois do "
-"NFS\" para esta pergunta. Por favor, note que a montagem NFS de /usr n�o "
-"poder� ser protegida pelo IPSec nesse caso."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
-"Caso voc� use um cart�o de rede PCMCIA para suas conex�es IPSec voc� "
-"precisar� somente optar por iniciar o Opensan depois dos servi�os PCMCIA. "
-"Responda \"depois do PCMCIA\" nesse caso. Esta � tamb�m a maneira correta de "
-"obter chaves de um servidor DNS sendo executado localmente e com suporte a "
-"DNSSec."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
 #, fuzzy
-msgid "Do you wish to restart strongSwan?"
+msgid "Restart strongSwan now?"
 msgstr "Voc� deseja reiniciar o Openswan ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
 #, fuzzy
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
 "Reiniciar o Openswan � uma boa id�ia, uma vez que caso exista um corre��o "
@@ -129,76 +96,60 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:3001
-#, fuzzy
-msgid "Do you wish to support IKEv1?"
-msgstr "Voc� deseja reiniciar o Openswan ?"
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-#, fuzzy
-msgid "Do you wish to support IKEv2?"
-msgstr "Voc� deseja reiniciar o Openswan ?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-msgid "Do you want to create a RSA public/private keypair for this host?"
+msgid "Start strongSwan's IKEv2 daemon?"
 msgstr ""
-"Voc� deseja criar um par de chaves RSA p�blica/privada para este host ?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
 #, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
+msgid "Create an RSA public/private keypair for this host?"
+msgstr ""
+"Voc� deseja criar um par de chaves RSA p�blica/privada para este host ?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
-msgstr ""
-"Este instalador pode automaticamente criar um par de chaves RSA p�blica/"
-"privada para este host. Esse par de chaves pode ser usado para autenticar "
-"conex�es IPSec com outros hosts e � a maneira preferida de construir "
-"conex�es IPSec seguras. A outra possibilidade seria usar segredos "
-"compartilhados (senhas que s�o iguais em ambos os lados do t�nel) para "
-"autenticar uma conex�o, mas para um grande n�mero de conex�es RSA a "
-"autentica��o � mais f�cil de administrar e mais segura."
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter.templates:6001
 #, fuzzy
 msgid ""
 "If you do not want to create a new public/private keypair, you can choose to "
@@ -208,23 +159,23 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid "Use an existing X.509 certificate for strongSwan?"
 msgstr ""
 "Voc� possui um arquivo de certificado X509 existente que voc� gostaria de "
 "usar com o Openswan ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter.templates:7001
 #, fuzzy
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
 "Este instalador pode extrair automaticamente a informa��o necess�ria de um "
 "certificado X509 existente com uma chave RSA privada adequada. Ambas as "
@@ -234,7 +185,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter.templates:8001
 #, fuzzy
 msgid "File name of your X.509 certificate in PEM format:"
 msgstr ""
@@ -242,7 +193,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter.templates:8001
 #, fuzzy
 msgid ""
 "Please enter the full location of the file containing your X.509 certificate "
@@ -253,20 +204,20 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
-msgid "File name of your X.509 private key in PEM format:"
+msgid "File name of your existing X.509 private key in PEM format:"
 msgstr ""
 "Por favor, informe a localiza��o de sua chave privada X509 no formato PEM."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter.templates:9001
 #, fuzzy
 msgid ""
 "Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
 "Por favor, informe a localiza��o do arquivo contendo a chave privada RSA que "
 "casa com seu certificado X509 no formato PEM. Este pode ser o mesmo arquivo "
@@ -274,64 +225,47 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
-#, fuzzy
-msgid "The length of the created RSA key (in bits):"
-msgstr "Qual deve ser o tamanho da chave RSA criada ?"
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:9001
-#, 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."
+#: ../strongswan-starter.templates:10001
 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."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"Por favor, informe o tamanho da chave RSA a ser criada. A mesma n�o deve ser "
-"menor que 1024 bits devido a uma chave de tamanho menor que esse ser "
-"considerada insegura. Voc� tamb�m n�o precisar� de nada maior que 2048 "
-"porque isso somente deixaria o processo de autentica��o mais lento e n�o "
-"seria necess�rio no momento."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
 #, fuzzy
-msgid "Do you want to create a self-signed X.509 certificate?"
+msgid "Create a self-signed X.509 certificate?"
 msgstr "Deseja criar um certificado X509 auto-assinado ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-#, fuzzy
+#: ../strongswan-starter.templates:11001
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
-msgstr ""
-"Este instalador pode criar automaticamente somente certificados X509 auto-"
-"assinados, devido a uma autoridade certificadora ser necess�ria para assinar "
-"a requisi��o de certificado. Caso voc� queira criar um certificado auto-"
-"assinado, voc� poder� us�-lo imediatamente para conex�o com outros hosts "
-"IPSec que suportem certificados X509 para autentica��o de conex�es IPSec. "
-"Por�m, caso voc� queira usar os novos recursos PKI do Openswan vers�o 1.91 "
-"ou superior, voc� precisar� possuir todos seus certificados X509 assinados "
-"por uma �nica autoridade certificadora para criar um caminho de confian�a."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
 #, fuzzy
 #| msgid ""
 #| "If you do not want to create a self-signed certificate, then this "
@@ -339,10 +273,9 @@ msgstr ""
 #| "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 get the certificate request signed by your certificate "
-"authority."
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"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� "
@@ -351,7 +284,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter.templates:12001
 #, fuzzy
 msgid "Country code for the X.509 certificate request:"
 msgstr ""
@@ -359,36 +292,27 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter.templates:12001
+#, fuzzy
+#| msgid ""
+#| "Please enter the 2 letter country code for your country. This code will "
+#| "be placed in the certificate request."
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
 "Por favor, informe o c�difo de pa�s de duas letras para seu pa�s. Esse "
 "c�digo ser� inserido na requisi��o de certificado."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
-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."
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
 msgstr ""
-"Voc� realmente precisa informar um c�digo de pa�s v�lido aqui devido ao "
-"openssl se recusar a gerar certificados sem um c�digo de pa�s v�lido. Um "
-"campo em branco � permitido para qualquer outro campo do certificado X.509, "
-"mas n�o para esse campo."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Exemplo: BR"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter.templates:13001
 #, fuzzy
 msgid "State or province name for the X.509 certificate request:"
 msgstr ""
@@ -397,23 +321,21 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter.templates:13001
+#, fuzzy
+#| msgid ""
+#| "Please enter the full name of the state or province you live in. This "
+#| "name will be placed in the certificate request."
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
 "Por favor, informe o nome complete do estado ou prov�ncia em que voc� mora. "
 "Esse nome ser� inserido na requisi��o de certificado."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "Exemplo : Sao Paulo"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter.templates:14001
 #, fuzzy
 msgid "Locality name for the X.509 certificate request:"
 msgstr ""
@@ -422,23 +344,21 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter.templates:14001
+#, fuzzy
+#| msgid ""
+#| "Please enter the locality (e.g. city) where you live. This name will be "
+#| "placed in the certificate request."
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
 "Por favor, informe a localidade (ou seja, cidade) onde voc� mora. Esse nome "
 "ser� inserido na requisi��o de certificado."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Exemplo : Sao Paulo"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter.templates:15001
 #, fuzzy
 msgid "Organization name for the X.509 certificate request:"
 msgstr ""
@@ -447,29 +367,23 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter.templates:15001
 #, fuzzy
 #| 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."
+#| "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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Por favor, informe a organiza��o (ou seja, a empresa) para a qual este "
-"certificado X509 dever� ser criado. Esse nome ser� inserido na requisi��o de "
-"certificado."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Exemplo : Debian"
+"Por favor, informe a unidade organizacional (ou seja, se��o ou departamento) "
+"para a qual este certificado dever� ser criado. Esse nome ser� inserido na "
+"requisi��o de certificado."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter.templates:16001
 #, fuzzy
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr ""
@@ -478,16 +392,15 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter.templates:16001
 #, fuzzy
 #| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
 "Por favor, informe a unidade organizacional (ou seja, se��o ou departamento) "
 "para a qual este certificado dever� ser criado. Esse nome ser� inserido na "
@@ -495,29 +408,22 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Exemplo : Grupo de Seguran�a"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter.templates:17001
 #, fuzzy
 msgid "Common name for the X.509 certificate request:"
 msgstr "Por favor, informe o nome comum para a requisi��o de certificado X509."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter.templates:17001
 #, fuzzy
 #| 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."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
 msgstr ""
 "Por favor, informe o nome comum (ou seja, o nome do host dessa m�quina) para "
 "o qual o certificado X509 dever� ser criado. Esse nome ser� inserido na "
@@ -525,13 +431,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Exemplo : gateway.debian.org"
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 #, fuzzy
 msgid "Email address for the X.509 certificate request:"
 msgstr ""
@@ -540,16 +440,15 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 #, fuzzy
 #| 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 "
 #| "certificate request."
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
 "Por favor, informe o endere�o de e-mail da pessoa ou organiza��o respons�vel "
 "pelo certificado X509. Esse endere�o ser� inserido na requisi��o de "
@@ -557,44 +456,241 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 #, fuzzy
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+msgid "Enable opportunistic encryption?"
 msgstr "Voc� deseja habilitar a encripta��o oportun�stica no Openswan ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-#, fuzzy
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
-msgstr ""
-"O Openswan suporta encripta��o oportun�stica (OE), a qual armazena "
-"informa��es de autentica��o IPSec (por exemplo, chaves p�blicas RSA) em "
-"registros DNS (preferivelmente seguros). At� que esse suporte esteja "
-"largamento sendo utilizado, ativ�-lo ir� causar uma signficante lentid�o "
-"para cada nova conex�o de sa�da. Iniciando a partir da vers�o 2.0, o "
-"Openswan, da forma como � distribu�do pelos desenvolvedores oficiais, � "
-"fornecido com o suporte a OE habilitado por padr�o e, portanto, "
-"provavelmente ir� quebrar suas conex�es existentes com a Internet (por "
-"exemplo, sua rota padr�o) t�o logo o pluto (o daemon de troca de chaves do "
-"Openswan) seja iniciado."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"Por favor, informe se voc� deseja habilitar o suporte a OE. Em caso de "
-"d�vidas, n�o habilite esse suporte."
+
+#~ msgid "earliest, \"after NFS\", \"after PCMCIA\""
+#~ msgstr "o quando antes, \"depois do NFS\", \"depois do PCMCIA\""
+
+#, fuzzy
+#~ msgid ""
+#~ "There are three possibilities when strongSwan can start: before or after "
+#~ "the NFS services and after the PCMCIA services. The correct answer "
+#~ "depends on your specific setup."
+#~ msgstr ""
+#~ "Com os n�veis de inicializa��o atuais do Debian (quase todos os servi�os "
+#~ "iniciando no n�vel 20) � imposs�vel para o Openswan sempre iniciar no "
+#~ "momento correto. Existem tr�s possibilidades para quando iniciar o "
+#~ "Openswan : antes ou depois dos servi�os NFS e depois dos servi�os PCMCIA. "
+#~ "A resposta correta depende se sua configura��o espec�fica."
+
+#, fuzzy
+#~ msgid ""
+#~ "If you do not have your /usr tree mounted via NFS (either you only mount "
+#~ "other, less vital trees via NFS or don't use NFS mounted trees at all) "
+#~ "and don't use a PCMCIA network card, then it's best to start strongSwan "
+#~ "at the earliest possible time, thus allowing the NFS mounts to be secured "
+#~ "by IPSec. In this case (or if you don't understand or care about this "
+#~ "issue), answer \"earliest\" to this question (the default)."
+#~ msgstr ""
+#~ "Caso voc� n�o possua sua �rvore /usr montada via NFS (voc� somente monta "
+#~ "outras �rvores n�o vitais via NFS ou n�o usa �rvores montadas via NFS) e "
+#~ "n�o use um cart�o de rede PCMCIA, a melhor op��o � iniciar o Openswan o "
+#~ "quando antes, permitindo dessa forma que os pontos de montagem NFS "
+#~ "estejam protegidos por IPSec. Nesse caso (ou caso voc� n�o compreenda ou "
+#~ "n�o se importe com esse problema), responda \"o quando antes\" para esta "
+#~ "pergunta (o que � o padr�o)."
+
+#, fuzzy
+#~ msgid ""
+#~ "If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
+#~ "card, then you will need to start strongSwan after NFS so that all "
+#~ "necessary files are available. In this case, answer \"after NFS\" to this "
+#~ "question. Please note that the NFS mount of /usr can not be secured by "
+#~ "IPSec in this case."
+#~ msgstr ""
+#~ "Caso voc� possua sua �rvore /usr montada via NFS e n�o use um cart�o de "
+#~ "rede PCMCIA, voc� precisar� iniciar o Openswan depois do NFS de modo que "
+#~ "todos os arquivos necess�rios estejam dispon�veis. Nesse caso, responda "
+#~ "\"depois do NFS\" para esta pergunta. Por favor, note que a montagem NFS "
+#~ "de /usr n�o poder� ser protegida pelo IPSec nesse caso."
+
+#~ msgid ""
+#~ "If you use a PCMCIA network card for your IPSec connections, then you "
+#~ "only have to choose to start it after the PCMCIA services. Answer \"after "
+#~ "PCMCIA\" 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 ""
+#~ "Caso voc� use um cart�o de rede PCMCIA para suas conex�es IPSec voc� "
+#~ "precisar� somente optar por iniciar o Opensan depois dos servi�os PCMCIA. "
+#~ "Responda \"depois do PCMCIA\" nesse caso. Esta � tamb�m a maneira correta "
+#~ "de obter chaves de um servidor DNS sendo executado localmente e com "
+#~ "suporte a DNSSec."
+
+#, fuzzy
+#~ msgid "Do you wish to restart strongSwan?"
+#~ msgstr "Voc� deseja reiniciar o Openswan ?"
+
+#, fuzzy
+#~ msgid "Do you wish to support IKEv1?"
+#~ msgstr "Voc� deseja reiniciar o Openswan ?"
+
+#, fuzzy
+#~ msgid "Do you wish to support IKEv2?"
+#~ msgstr "Voc� deseja reiniciar o Openswan ?"
+
+#, fuzzy
+#~| msgid ""
+#~| "This installer can automatically create a RSA public/private keypair for "
+#~| "this host. This keypair can be used to authenticate IPSec connections to "
+#~| "other hosts and is the preferred way for building up secure IPSec "
+#~| "connections. The other possibility would be to use shared secrets "
+#~| "(passwords that are the same on both sides of the tunnel) for "
+#~| "authenticating an connection, but for a larger number of connections RSA "
+#~| "authentication is easier to administer and more secure."
+#~ msgid ""
+#~ "This installer can automatically create a RSA public/private keypair with "
+#~ "an X.509 certificate for this host. This can be used to authenticate  "
+#~ "IPSec connections to other hosts and is the preferred way for building "
+#~ "up  secure IPSec connections. The other possibility would be to use pre-"
+#~ "shared  secrets (PSKs, passwords that are the same on both sides of the "
+#~ "tunnel) for authenticating an connection, but for a larger number of "
+#~ "connections RSA authentication is easier to administer and more secure. "
+#~ "Note that having a keypair allows to use both X.509 and PSK "
+#~ "authentication for IPsec  tunnels."
+#~ msgstr ""
+#~ "Este instalador pode automaticamente criar um par de chaves RSA p�blica/"
+#~ "privada para este host. Esse par de chaves pode ser usado para autenticar "
+#~ "conex�es IPSec com outros hosts e � a maneira preferida de construir "
+#~ "conex�es IPSec seguras. A outra possibilidade seria usar segredos "
+#~ "compartilhados (senhas que s�o iguais em ambos os lados do t�nel) para "
+#~ "autenticar uma conex�o, mas para um grande n�mero de conex�es RSA a "
+#~ "autentica��o � mais f�cil de administrar e mais segura."
+
+#, fuzzy
+#~ msgid "The length of the created RSA key (in bits):"
+#~ msgstr "Qual deve ser o tamanho da chave RSA criada ?"
+
+#, 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 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."
+#~ msgstr ""
+#~ "Por favor, informe o tamanho da chave RSA a ser criada. A mesma n�o deve "
+#~ "ser menor que 1024 bits devido a uma chave de tamanho menor que esse ser "
+#~ "considerada insegura. Voc� tamb�m n�o precisar� de nada maior que 2048 "
+#~ "porque isso somente deixaria o processo de autentica��o mais lento e n�o "
+#~ "seria necess�rio no momento."
+
+#, fuzzy
+#~ msgid ""
+#~ "This installer can only create self-signed X.509 certificates "
+#~ "automatically, because otherwise a certificate authority is needed to "
+#~ "sign the certificate request. If you want to create a self-signed "
+#~ "certificate, you can use it immediately to connect to other IPSec hosts "
+#~ "that support X.509 certificate for authentication of IPSec connections. "
+#~ "However, if you want to use the new PKI features of strongSwan >= 1.91, "
+#~ "you will need to have all X.509 certificates signed by a single "
+#~ "certificate authority to create a trust path."
+#~ msgstr ""
+#~ "Este instalador pode criar automaticamente somente certificados X509 auto-"
+#~ "assinados, devido a uma autoridade certificadora ser necess�ria para "
+#~ "assinar a requisi��o de certificado. Caso voc� queira criar um "
+#~ "certificado auto-assinado, voc� poder� us�-lo imediatamente para conex�o "
+#~ "com outros hosts IPSec que suportem certificados X509 para autentica��o "
+#~ "de conex�es IPSec. Por�m, caso voc� queira usar os novos recursos PKI do "
+#~ "Openswan vers�o 1.91 ou superior, voc� precisar� possuir todos seus "
+#~ "certificados X509 assinados por uma �nica autoridade certificadora para "
+#~ "criar um caminho de confian�a."
+
+#~ 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 ""
+#~ "Voc� realmente precisa informar um c�digo de pa�s v�lido aqui devido ao "
+#~ "openssl se recusar a gerar certificados sem um c�digo de pa�s v�lido. Um "
+#~ "campo em branco � permitido para qualquer outro campo do certificado "
+#~ "X.509, mas n�o para esse campo."
+
+#~ msgid "Example: AT"
+#~ msgstr "Exemplo: BR"
+
+#~ msgid "Example: Upper Austria"
+#~ msgstr "Exemplo : Sao Paulo"
+
+#~ msgid "Example: Vienna"
+#~ msgstr "Exemplo : Sao Paulo"
+
+#, fuzzy
+#~| 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."
+#~ msgid ""
+#~ "Please enter the organization (e.g. company) that the X.509 certificate "
+#~ "should be created for. This name will be placed in the certificate "
+#~ "request."
+#~ msgstr ""
+#~ "Por favor, informe a organiza��o (ou seja, a empresa) para a qual este "
+#~ "certificado X509 dever� ser criado. Esse nome ser� inserido na requisi��o "
+#~ "de certificado."
+
+#~ msgid "Example: Debian"
+#~ msgstr "Exemplo : Debian"
+
+#~ msgid "Example: security group"
+#~ msgstr "Exemplo : Grupo de Seguran�a"
+
+#~ msgid "Example: gateway.debian.org"
+#~ msgstr "Exemplo : gateway.debian.org"
+
+#, fuzzy
+#~ msgid ""
+#~ "strongSwan comes with support for opportunistic encryption (OE), which "
+#~ "stores IPSec authentication information (i.e. RSA public keys) in "
+#~ "(preferably secure) DNS records. Until this is widely deployed, "
+#~ "activating it will cause a significant slow-down for every new, outgoing "
+#~ "connection. Since version 2.0, strongSwan upstream comes with OE enabled "
+#~ "by default and is thus likely to break your existing connection to the "
+#~ "Internet (i.e. your default route) as soon as pluto (the strongSwan "
+#~ "keying daemon) is started."
+#~ msgstr ""
+#~ "O Openswan suporta encripta��o oportun�stica (OE), a qual armazena "
+#~ "informa��es de autentica��o IPSec (por exemplo, chaves p�blicas RSA) em "
+#~ "registros DNS (preferivelmente seguros). At� que esse suporte esteja "
+#~ "largamento sendo utilizado, ativ�-lo ir� causar uma signficante lentid�o "
+#~ "para cada nova conex�o de sa�da. Iniciando a partir da vers�o 2.0, o "
+#~ "Openswan, da forma como � distribu�do pelos desenvolvedores oficiais, � "
+#~ "fornecido com o suporte a OE habilitado por padr�o e, portanto, "
+#~ "provavelmente ir� quebrar suas conex�es existentes com a Internet (por "
+#~ "exemplo, sua rota padr�o) t�o logo o pluto (o daemon de troca de chaves "
+#~ "do Openswan) seja iniciado."
+
+#~ msgid ""
+#~ "Please choose whether you want to enable support for OE. If unsure, do "
+#~ "not enable it."
+#~ msgstr ""
+#~ "Por favor, informe se voc� deseja habilitar o suporte a OE. Em caso de "
+#~ "d�vidas, n�o habilite esse suporte."
 
 #~ msgid "x509, plain"
 #~ msgstr "x509, pura"
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 000000000..435ce53b6
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,446 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: strongswan 4.2.14-2\n"
+"Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 15:00+0100\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "как можно раньше"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "после NFS"
+
+#. Type: select
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "после PCMCIA"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "Когда запускать strongSwan:"
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
+msgstr ""
+"StrongSwan запускается при загрузке системы для того, чтобы можно было "
+"защитить автоматически монтируемые файловые системы."
+
+#. Type: select
+#. Description
+#: ../strongswan-starter.templates:2002
+msgid ""
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
+msgstr ""
+" * как можно раньше: если /usr не монтируется через NFS и не используется\n"
+"   сетевая карта PCMCIA, то лучше всего запускать strongSwan как можно\n"
+"   раньше для того, чтобы NFS можно было безопасно монтировать через IPSec;\n"
+" * после NFS: рекомендуется, если /usr монтируется через NFS и не\n"
+"   используется сетевая карта PCMCIA;\n"
+" * после PCMCIA: рекомендуется, если для IPSec соединения используется\n"
+"   сетевая карта PCMCIA, или если для этого нужны ключи, получаемые с "
+"локально\n"
+"   запущенного DNS сервера с поддержкой DNSSec."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Перезапустить strongSwan прямо сейчас?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+msgid ""
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
+"existing connections and then bring them back up."
+msgstr ""
+"Рекомендуется перезапустить strongSwan так как, если были исправления в "
+"безопасности, то они не будут задействованы без перезапуска службы. Однако, "
+"это может вызвать переподключение существующих соединений."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:3001
+#| msgid ""
+#| "If you don't restart strongSwan now, you should do so manually at the "
+#| "first  opportunity."
+msgid ""
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
+msgstr ""
+"Если вы не перезапустите strongSwan сейчас, то сделайте это вручную при "
+"первой возможности."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Запустить службу strongSwan IKEv1?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:4001
+msgid ""
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Для поддержки 1-й версии протокола обмена ключами Интернет должна быть "
+"запущена служба pluto."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Запустить службу strongSwan IKEv2?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:5001
+msgid ""
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
+msgstr ""
+"Для поддержки 2-й версии протокола обмена ключами Интернет должна быть "
+"запущена служба charon."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Создать открытый/закрытый ключи RSA для этой машины?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
+msgstr ""
+"Для аутентификации IPSec соединений с другими машинами в strongSwan можно "
+"использовать общий ключ (PSK) или пару ключей RSA. Аутентификация RSA "
+"считается более безопасной и простой в администрировании. Также вы можете "
+"использовать аутентификации PSK и RSA одновременно."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:6001
+msgid ""
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
+msgstr ""
+"Если вы не хотите создавать новую пару открытых/закрытых ключей, то далее "
+"сможете указать использовать имеющиеся."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Использовать существующий сертификат X.509 для strongSwan?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:7001
+msgid ""
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
+msgstr ""
+"Требуемая информация может быть автоматически извлечена из существующего "
+"сертификата X.509 с помощью подходящего закрытого ключа RSA. Обе части могут "
+"быть в одном файле, если он имеет формат PEM. Ответьте утвердительно, если у "
+"вас есть такой сертификат и файл с ключом, и вы хотите использовать его для "
+"аутентификации соединений IPSec."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Имя файла сертификата X.509 в формате PEM:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:8001
+msgid ""
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
+msgstr ""
+"Введите полный путь к файлу, содержащему ваш сертификат X.509 в формате PEM."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Имя файла существующего закрытого ключа X.509 в формате PEM:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:9001
+msgid ""
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
+msgstr ""
+"Введите полный путь к файлу, содержащему закрытый ключ RSA для вашего "
+"сертификата X.509 в формате PEM. Это может быть тот же файл, что и для "
+"сертификата X.509."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+msgid "RSA key length:"
+msgstr "Длина ключа RSA:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:10001
+#| msgid ""
+#| "Please enter the length of RSA key you wish to generate. A value of less "
+#| "than  1024 bits is not considered secure. A value of more than 2048 bits "
+#| "will  probably affect performance."
+msgid ""
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
+msgstr ""
+"Введите длину генерируемого ключа RSA. Значение менее 1024 бит не считается "
+"надёжным. Значение более 2048 бит, вероятно, повлияет на производительность."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Создать самоподписанный сертификат X.509?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
+msgstr ""
+"Автоматически можно создавать только самоподписанные сертификаты X.509, так "
+"как в противном случае нужно делать запрос подписи сертификата в центре "
+"сертификации."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+msgid ""
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
+msgstr ""
+"Если вы ответите утвердительно, то созданный сертификат сразу можно "
+"использовать для подключения к другим IPSec машинам, поддерживающим "
+"аутентификацию с помощью сертификатов X.509. Однако, для использования PKI "
+"возможностей strongSwan требуется создание пути доверия, где все сертификаты "
+"X.509 подписаны одним центром."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:11001
+#| msgid ""
+#| "If you do not accept this option, only the RSA private key will be "
+#| "created, along with a certificate request which you will need to have "
+#| "signed by a  certificate authority."
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Если вы ответите отрицательно, то будет создан только закрытый ключ RSA, а "
+"также запрос для сертификата, который вам нужно подписать в центре "
+"сертификации."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "Country code for the X.509 certificate request:"
+msgstr "Код страны для запроса сертификата X.509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid ""
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
+msgstr ""
+"Введите двухбуквенный код страны согласно ISO3166, который должен "
+"использоваться в запросе сертификата."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:12001
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr "Это поле обязательно; иначе сертификат не может быть сгенерирован."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid "State or province name for the X.509 certificate request:"
+msgstr "Название области или округа для запроса сертификата X509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:13001
+msgid ""
+"Please enter the full name of the state or province to include in the "
+"certificate request."
+msgstr ""
+"Введите полное название области или округа для включения в запрос "
+"сертификата."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Название места для запроса сертификата X509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:14001
+msgid ""
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
+msgstr ""
+"Введите название места (обычно город) для включения в запрос сертификата."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Название организации для запроса сертификата X509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:15001
+msgid ""
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
+msgstr ""
+"Введите название организации (обычно, название компании) для включения в "
+"запрос сертификата."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Название структурной единицы организации для запроса сертификата X509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:16001
+#| msgid ""
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
+msgid ""
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
+msgstr ""
+"Введите название структурной единицы организации (обычно, подразделение) для "
+"включения в запрос сертификата."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Общеизвестное название для запроса сертификата X509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:17001
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Введите общеизвестное название (например, имя данного компьютера) для "
+"включения в запрос сертификата."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid "Email address for the X.509 certificate request:"
+msgstr "Адрес электронной почты для запроса сертификата X509:"
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
+msgid ""
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
+msgstr ""
+"Введите адрес электронной почты (человека или организации) для включения в "
+"запрос сертификата."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Включить поддержку гибкого шифрования?"
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
+msgstr ""
+"Эта версия strongSwan поддерживает гибкое шифрование (opportunistic "
+"encryption, OE), при котором информация об аутентификации IPSec хранится в "
+"записях DNS. Пока это широко не станет распространено, данная поддержка "
+"приведёт к значительной задержке при каждом новом исходящем соединении."
+
+#. Type: boolean
+#. Description
+#: ../strongswan-starter.templates:19001
+msgid ""
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
+msgstr ""
+"Включайте гибкое шифрование, если вам это действительно нужно. Это может "
+"прервать соединение с интернетом (маршрут по умолчанию) при запуске службы "
+"pluto."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index d2f4d7a4a..794609d57 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,4 +1,4 @@
-# translation of strongswan_4.2.4-1_sv.po to Swedish
+# translation of strongswan_sv.po to Swedish
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -12,13 +12,13 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-# Martin �gren <martin.agren@gmail.com>, 2008.
+# Martin �gren <martin.agren@gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: strongswan_4.2.4-1_sv\n"
+"Project-Id-Version: strongswan_sv\n"
 "Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
-"PO-Revision-Date: 2008-07-29 19:30+0200\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-12 08:19+0200\n"
 "Last-Translator: Martin �gren <martin.agren@gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -31,601 +31,412 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "tidigast, \"efter NFS\", \"efter PCMCIA\""
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "tidigt"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
-msgstr "N�r strongSwan ska startas om:"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "efter NFS"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
-msgstr ""
-"Det finns tre m�jligheter f�r n�r strongSwan kan startas: f�re eller efter "
-"NFS-tj�nsterna samt efter PCMCIA-tj�nsterna. Det r�tta svaret beror p� din "
-"specifika konfiguration."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "efter PCMCIA"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"Om du inte har ditt /usr-tr�d monterat via NFS (antingen monterar du bara "
-"andra, mindre viktiga tr�d via NFS eller s� anv�nder du inte NFS-monterade "
-"tr�d alls) och inte anv�nder ett PCMCIA-n�tverkskort, �r det b�st att starta "
-"strongSwan s� tidigt som m�jligt och d�rmed till�ta s�kra NFS-monteringar "
-"via IPSec. I detta fall (eller om du inte f�rst�r eller bryr dig om detta), "
-"svara \"tidigast\" p� denna fr�ga (standard)."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "N�r strongSwan ska startas om:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
 msgstr ""
-"Om du har ditt /usr-tr�d monterat via NFS och inte anv�nder ett PCMCIA-"
-"n�tverkskort, beh�ver du starta strongSwan efter NFS s� att alla n�dv�ndiga "
-"filer finns tillg�ngliga. I detta fall, svara \"efter NFS\" p� denna fr�ga. "
-"Notera dock att NFS-monteringen av /usr inte kan s�kras upp via IPSec i "
-"detta fall."
+"StrongSwan startar under systemuppstart s� att det kan skydda filsystem som "
+"monteras automatiskt."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
-"Om du anv�nder ett PCMCIA-n�tverkskort f�r dina IPSec-anslutningar har du "
-"bara valet att starta den efter PCMCIA-tj�nsterna. Svara \"efter PCMCIA\" i "
-"detta fall. Detta �r ocks� det r�tta svaret om du vill h�mta nycklar fr�n en "
-"lokalt k�rande DNS-server med DNSSec-st�d."
+" * tidigt: om /usr inte monteras genom NFS och om du inte vill anv�nda\n"
+"   ett PCMCIA-n�tverkskort, �r det b�st att starta strongSwan s� snart\n"
+"   som m�jligt, s� att NFS-monteringar kan s�kras med IPSec;\n"
+" * efter NFS: rekommenderas n�r /usr monteras genom NFS och inget\n"
+"   PCMCIA-n�tv�rkskort anv�nds;\n"
+" * efter PCMCIA: rekommenderas om IPSec-uppkopplingen anv�nder ett\n"
+"   PCMCIA-n�tverkskort eller om det beh�ver h�mta nycklar fr�n en\n"
+"   DNS-server som k�r lokalt med DNSSec-st�d."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
-msgstr "Vill du starta om strongSwan?"
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Starta om strongSwan nu?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
-"Att starta om strongSwan �r en bra id�, eftersom en eventuell "
-"s�kerhetsr�ttning inte kommer r�ttas till f�rr�n demonen �r omstartad. De "
-"flesta personer f�rv�ntar sig att demonen startar om s� detta �r generellt "
-"sett en bra id�. Detta kan dock eventuellt ta ner existerande anslutningar "
-"och sedan ta upp dem igen."
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates:3001
-msgid "Do you wish to support IKEv1?"
-msgstr "Vill du st�dja IKEv1?"
+"Att starta om strongSwan rekommenderas eftersom en eventuell "
+"s�kerhetsr�ttning inte kommer anv�ndas f�rr�n demonen startats om. Detta kan "
+"dock eventuellt st�nga existerande anslutningar och sedan ta upp dem igen."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
-"strongSwan st�djer b�da versionerna av nyckelutbytesprotokollet IKE, IKEv1 "
-"och IKEv2. Vill du starta \"pluto\"-demonen f�r IKEv1-st�d n�r strongSwan "
-"startas?"
+"Om du inte startar om strongSwan nu, ska du g�ra det manuellt s� snart "
+"tillf�lle ges."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-msgid "Do you wish to support IKEv2?"
-msgstr "Vill du st�dja IKEv2?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Starta strongSwans IKEv1-demon?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"strongSwan st�djer b�da versionerna av nyckelutbytesprotokollet IKE, IKEv1 "
-"och IKEv2. Vill du starta \"charon\"-demonen f�r IKEv2-st�d n�r strongSwan "
-"startas?"
+"Pluto-demonen m�ste k�ras f�r att st�dja version 1 av Internet Key Exchange-"
+"protokollet."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-msgid "Do you want to create a RSA public/private keypair for this host?"
-msgstr "Vill du skapa ett publik/privat RSA-nyckelpar f�r denna v�rdmaskin?"
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Starta strongSwans IKEv2-demon?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"Denna installerare kan automatiskt skapa ett publik/privat RSA-nyckelpar f�r "
-"denna v�rdmaskin. Detta nyckelpar kan anv�ndas f�r att autentisera IPSec-"
-"anslutningar till andra v�rdar och �r det s�tt som f�redras f�r att bygga "
-"upp s�kra IPSec-anslutningar. Den andra m�jligheten skulle vara att anv�nda "
-"delade hemligheter (l�senord som �r samma p� b�da sidor av tunneln) f�r att "
-"autentisera en anslutning men f�r ett st�rre antal anslutningar �r RSA-"
-"autentiseringar enklare att administrera och s�krare."
+"Charon-demonen m�ste k�ras f�r att st�dja version 2 av Internet Key Exchange-"
+"protokollet."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "If you do not want to create a new public/private keypair, you can choose "
-#| "to use an existing one."
-msgid ""
-"If you do not want to create a new public/private keypair, you can choose to "
-"use an existing one in the next step."
-msgstr "Om du inte vill skapa ett nytt nyckelpar kan du v�lja ett existerande."
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Vill du skapa ett RSA-nyckelpar f�r denna v�rdmaskin?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid "Do you have an existing X509 certificate file for strongSwan?"
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
 msgstr ""
-"Har du en existerande X509-certifikatsfil som du vill anv�nda f�r strongSwan?"
+"StrongSwan kan anv�nda en f�rutdelad nyckel (Pre-Shared Key, PSK) eller ett "
+"RSA-nyckelpar f�r att autentisera IPSec-uppkopplingar till andra "
+"v�rdmaskiner. RSA-autentisering anses generellt vara mer s�kert och �r "
+"enklare att administrera. Du kan anv�nda PSK- och RSA-autentisering "
+"samtidigt."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically extract the needed information from an "
-#| "existing X509 certificate with a matching RSA private key. Both parts can "
-#| "be in one file, if it is in PEM format. If you have such an existing "
-#| "certificate and key file and want to use it for authenticating IPSec "
-#| "connections, then please answer yes."
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
 msgstr ""
-"Denna installerare kan automatiskt plocka ut den information som beh�vs fr�n "
-"ett existerande X509-certifikat med en matchande privat RSA-nyckel. B�da "
-"delarna kan vara i en fil om den �r i PEM-format. Om du har ett s�dant "
-"existerande certifikat och nyckelfil och vill anv�nda det f�r att "
-"autentisera IPSec-anslutningar, svara ja p� fr�gan."
+"Om du inte vill skapa ett nytt nyckelpar kan du v�lja att anv�nda ett "
+"existerande par i n�sta steg."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, fuzzy
-#| msgid "File name of your X509 certificate in PEM format:"
-msgid "File name of your X.509 certificate in PEM format:"
-msgstr "Platsen f�r ditt X509-certifikat i PEM-format:"
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Vill du anv�nda ett existerande X.509-certifikat f�r strongSwan?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, 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 X.509 certificate "
-"in PEM format."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
-"Ange platsen f�r den fil som inneh�ller ditt X509-certifikat i PEM-format."
+"Den information som beh�vs kan plockas ut automatiskt fr�n ett existerande "
+"X.509-certifikat med en matchande privat RSA-nyckel. B�da delarna kan vara i "
+"en fil om den �r i PEM-format. V�lj detta alternativ om du har ett s�dant "
+"certifikat och nyckelfil och vill anv�nda det f�r att autentisera IPSec-"
+"anslutningar."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| msgid "File name of your X509 private key in PEM format:"
-msgid "File name of your X.509 private key in PEM format:"
-msgstr "Platsen f�r din privata X509-nyckel i PEM-format:"
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Namn p� filen med ditt X.509-certifikat i PEM-format:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-#| 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 contains the X509 certificate."
 msgid ""
-"Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
 msgstr ""
-"Ange platsen f�r den fil som inneh�ller den privata RSA-nyckeln som matchar "
-"ditt X509-certifikat i PEM-format. Detta kan vara samma fil som inneh�ller "
-"X509-certifikatet."
+"Ange platsen f�r den fil som inneh�ller ditt X.509-certifikat i PEM-format."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
-msgstr "L�ngd p� den skapade RSA-nyckeln (i bitar):"
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Namn p� filen med din privata X.509-nyckel i PEM-format:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
 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."
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
-"Ange l�ngden f�r den skapade RSA-nyckeln. Den b�r inte vara kortare �n 1024 "
-"bitar, eftersom detta anses som os�kert, och du vill antagligen inte ha "
-"n�got l�ngre �n 2048 bitar, eftersom det bara g�r autentiseringsprocessen "
-"l�ngsammare och inte �r n�dv�ndigt just nu."
+"Ange platsen f�r den fil som inneh�ller den privata RSA-nyckel som matchar "
+"ditt X.509-certifikat i PEM-format. Detta kan vara samma fil som inneh�ller "
+"X.509-certifikatet."
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid "Do you want to create a self-signed X509 certificate?"
-msgid "Do you want to create a self-signed X.509 certificate?"
-msgstr "Vill du skapa ett sj�lvsignerat X509-certifikat?"
+msgid "RSA key length:"
+msgstr "RSA-nyckell�ngd:"
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-#| msgid ""
-#| "This installer can only create self-signed X509 certificates "
-#| "automatically, because otherwise a certificate authority is needed to "
-#| "sign the certificate request. If you want to create a self-signed "
-#| "certificate, you can use it immediately to connect to other IPSec hosts "
-#| "that support X509 certificate for authentication of IPSec connections. "
-#| "However, if you want to use the new PKI features of strongSwan >= 1.91, "
-#| "you will need to have all X509 certificates signed by a single "
-#| "certificate authority to create a trust path."
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
-"Denna installerare kan bara skapa sj�lvsignerade X509-certifikat "
-"automatiskt, eftersom det annars beh�vs en certifikatsutst�llare som kan "
-"signera certifikatsf�rfr�gan. Om du vill skapa ett sj�lvsignerat certifikat, "
-"kan du anv�nda det omedelbart f�r att ansluta till andra IPSec-v�rdar som "
-"har st�d f�r X509-certifikat f�r autentisering f�r IPSec-anslutningar. Om du "
-"vill anv�nda de nya PKI-funktionerna i strongSwan >= 1.91, beh�ver du dock "
-"ha alla X509-certifikat signerade av en enda certifikatsutst�llare f�r att "
-"skapa en p�litlig v�g."
+"Ange l�ngden p� nyckeln du vill generera. Ett v�rde mindre �n 1024 bitar "
+"anses inte s�kert. Ett v�rde p� mer �n 2048 bitar kommer antagligen p�verka "
+"prestanda."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-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 get the certificate request signed by your certificate "
-"authority."
-msgstr ""
-"Om du inte vill skapa ett sj�lvsignerat certifikat, kommer denna "
-"installerare bara att skapa den privata RSA-nyckeln och den "
-"certifikatsf�rfr�gan som du beh�ver f� signerad av din certifikatsutst�llare."
-
-#. Type: string
-#. Description
 #: ../strongswan-starter.templates:11001
-#, fuzzy
-#| msgid "Country code for the X509 certificate request:"
-msgid "Country code for the X.509 certificate request:"
-msgstr "Landskod f�r X509-certifikatsf�rfr�gan:"
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Vill du skapa ett sj�lvsignerat X.509-certifikat?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
 msgstr ""
-"Ange en landskod med 2 bokst�ver f�r ditt land. Denna kod kommer att "
-"placeras i certifikatsf�rfr�gan."
+"Endast sj�lvsignerade X.509-certifikat kan skapas automatiskt, eftersom det "
+"annars beh�vs en certifikatsutst�llare som signerar certifikatsf�rfr�gan."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 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."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
 msgstr ""
-"Du beh�ver verkligen ange en giltig landskod h�r, eftersom openssl annars "
-"kommer v�gra att generera ett certifikat. Ett tomt f�lt �r till�tet f�r alla "
-"andra f�lt i X509-certifikatet men inte f�r detta."
+"Om du v�ljer detta alternativ, kan certifikatet omedelbart anv�ndas f�r att "
+"ansluta �ver IPSec-v�rdmaskiner som st�djer autentisering via ett X.509-"
+"certifikat. Anv�nds strongSwans PKI-funktioner kr�vs d�remot att en "
+"tillitsv�g (eng. trust path) skapas genom att alla X.509-certifikat signeras "
+"av en s�rskild certifikatsutst�llare."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Exempel: SE"
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Om du inte v�ljer detta alternativ, kommer endast den privata RSA-nyckeln "
+"skapas tillsammans med den certifikatsf�rfr�gan som du beh�ver f� signerad "
+"av din certifikatsutst�llare."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-#, fuzzy
-#| msgid "State or province name for the X509 certificate request:"
-msgid "State or province name for the X.509 certificate request:"
-msgstr "Region eller l�n f�r X509-certifikatsf�rfr�gan:"
+msgid "Country code for the X.509 certificate request:"
+msgstr "Landskod f�r X.509-certifikatsf�rfr�gan:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
-"Ange det fulla namnet p� regionen eller l�net du bor i. Detta namn kommer "
-"att placeras i certifikatsf�rfr�gan."
+"Ange den ISO3166-landskod med 2 bokst�ver som ska anv�ndas i "
+"certifikatsf�rfr�gan. (Sverige har landskod SE.)"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "Exempel: Centrala Sverige"
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr "Detta �r f�lt �r obligatoriskt; annars kan inget certifikat skapas."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
-#, fuzzy
-#| msgid "Locality name for the X509 certificate request:"
-msgid "Locality name for the X.509 certificate request:"
-msgstr "Lokaliteten f�r X509-certifikatsf�rfr�gan:"
+msgid "State or province name for the X.509 certificate request:"
+msgstr "Region eller l�n f�r X.509-certifikatsf�rfr�gan:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
-"Ange lokaliteten (exempelvis staden) d�r du bor. Detta namn kommer att "
-"placeras i certifikatsf�rfr�gan."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Exempel: Stockholm"
+"Ange namnet p� regionen eller landet som ska anv�ndas i certifikatsf�rfr�gan."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| msgid "Organization name for the X509 certificate request:"
-msgid "Organization name for the X.509 certificate request:"
-msgstr "Organisationsnamnet f�r X509-certifikatsf�rfr�gan:"
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Lokaliteten f�r X.509-certifikatsf�rfr�gan:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
-"Ange organisationen (exempelvis f�retaget) som X509-certifikatet ska skapas "
-"f�r. Detta namn kommer att placeras i certifikatsf�rfr�gan."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Exempel: Debian"
+"Ange lokaliteten (ofta en stad) som ska anv�ndas i certifikatsf�rfr�gan."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| msgid "Organizational unit for the X509 certificate request:"
-msgid "Organizational unit for the X.509 certificate request:"
-msgstr "Organisationsenheten f�r X509-certifikatsf�rfr�gan:"
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Organisationsnamnet f�r X.509-certifikatsf�rfr�gan:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Ange organisationsenheten (exempelvis avdelningen) som X509-certifikatet ska "
-"skapas f�r. Detta namn kommer att placeras i certifikatsf�rfr�gan."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Exempel: s�kerhetsgruppen"
+"Ange organisationsnamnet (ofta ett f�retag) som ska anv�ndas i "
+"certifikatsf�rfr�gan."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-#| msgid "Common name for the X509 certificate request:"
-msgid "Common name for the X.509 certificate request:"
-msgstr "Namnet f�r X509-certifikatsf�rfr�gan:"
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Organisationsenheten f�r X.509-certifikatsf�rfr�gan:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
-"Ange namnet (exempelvis v�rdnamnet f�r denna maskin) som X509-certifikatet "
-"ska skapas f�r. Detta namn kommer att placeras i certifikatsf�rfr�gan."
+"Ange organisationsenheten (ofta en avdelning) som ska anv�ndas i "
+"certifikatsf�rfr�gan."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Exempel: gateway.debian.org"
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Namnet p� X.509-certifikatsf�rfr�gan:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:17001
-#, fuzzy
-#| msgid "Email address for the X509 certificate request:"
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Ange namnet (exempelvis v�rdnamnet f�r denna maskin) som ska anv�ndas i "
+"certifikatsf�rfr�gan."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
 msgid "Email address for the X.509 certificate request:"
-msgstr "E-postadressen f�r X509-certifikatsf�rfr�gan:"
+msgstr "E-postadressen f�r X.509-certifikatsf�rfr�gan:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
-#, fuzzy
-#| 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 "
-#| "certificate request."
+#: ../strongswan-starter.templates:18001
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
-"Ange e-postadressen till den person eller organisation som ansvarar f�r X509-"
-"certifikatet. Denna adress kommer att placeras i certifikatsf�rfr�gan."
+"Ange den e-postadress (till den ansvariga personen eller organisationen) som "
+"ska anv�ndas i certifikatsf�rfr�gan."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
-msgstr "Vill du aktivera opportunistisk kryptering i strongSwan?"
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Vill du aktivera opportunistisk kryptering?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
 msgstr ""
-"strongSwan har st�d f�r opportunistisk kryptering (OE) som lagrar "
-"information om IPSec-autentiseringen (exempelvis publika RSA-nycklar) i "
-"(helst s�kra) DNS-poster. Tills detta �r en mer utbredd tj�nst kan "
-"aktivering av det orsaka en betydande hastighetss�nkning f�r varje ny "
-"utg�ende anslutning. Sedan version 2.0 kommer strongSwan fr�n uppstr�ms med "
-"OE aktiverad som standard och kommer d�rf�r sannolikt att bryta din "
-"existerande anslutning till Internet (exempelvis din standardrutt) s� snart "
-"som pluto (demonen f�r strongSwan-nycklar) startas."
+"Denna version av strongSwan st�djer opportunistisk kryptering (OE), som "
+"lagrar IPSec-autentiseringsinformation i DNS-registret. Till dess detta "
+"anv�nds i stor utstr�ckning, kommer aktivering av det att orsaka betydande "
+"f�rdr�jningar f�r varje ny utg�ende anslutning."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"V�lj huruvida du vill aktivera st�d f�r OE. Om du �r os�ker b�r du inte "
-"aktivera det."
-
-#~ msgid "x509, plain"
-#~ msgstr "x509, enkel"
-
-#~ msgid "The type of RSA keypair to create:"
-#~ msgstr "Typ av RSA-nyckelpar som ska skapas:"
-
-#~ 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 ""
-#~ "Det �r m�jligt att skapa ett enkelt publik/privat RSA-nyckelpar f�r "
-#~ "anv�ndning med strongSwan eller att skapa en X509-certifikatsfil som "
-#~ "inneh�ller den publika RSA-nyckeln och dessutom lagrar motsvarande "
-#~ "privata nyckel."
-
-#~ 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 "
-#~ "want to connect to other IPSec implementations, you will need a X509 "
-#~ "certificate. It is also possible to create a X509 certificate here and "
-#~ "extract the RSA public key in plain format if the other side runs "
-#~ "strongSwan without X509 certificate support."
-#~ msgstr ""
-#~ "Om du bara vill bygga upp IPSec-anslutningar till v�rdmaskiner som ocks� "
-#~ "k�r strongSwan kan det vara lite enklare att anv�nda enkla RSA-nyckelpar. "
-#~ "Men om du vill ansluta till andra IPSec-implementationer, kommer du "
-#~ "beh�va ett X509-certifikat. Det �r ocks� m�jligt att skapa ett X509-"
-#~ "certifikat h�r och plocka ut den publika RSA-nyckeln i enkelt format om "
-#~ "den andra sidan k�r strongSwan utan st�d f�r X509-certifikat."
-
-#~ 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 "
-#~ "certificate and its use in strongSwan anyway."
-#~ msgstr ""
-#~ "D�rf�r rekommenderas ett X509-certifikat eftersom det �r mer flexibelt "
-#~ "och denna installerare b�r kunna g�mma det komplexa skapandet av X509-"
-#~ "certifikatet och dess anv�ndning i strongSwan �nd�."
+"Du ska bara aktivera opportunistisk kryptering om du �r s�ker p� att du vill "
+"ha det. Det kan bryta internetanslutningen (standardv�gen) n�r pluto-demonen "
+"startas."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index a476dbcc5..60d6e4b8c 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: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
+"POT-Creation-Date: 2009-05-25 14:44+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"
@@ -18,392 +18,345 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
 msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid "When to start strongSwan:"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
 msgstr ""
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-msgid "Do you wish to restart strongSwan?"
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter.templates:3001
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:3001
-msgid "Do you wish to support IKEv1?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates: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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-msgid "Do you wish to support IKEv2?"
+msgid "Start strongSwan's IKEv1 daemon?"
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-msgid "Do you want to create a RSA public/private keypair for this host?"
+msgid "Start strongSwan's IKEv2 daemon?"
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
-msgid ""
-"If you do not want to create a new public/private keypair, you can choose to "
-"use an existing one in the next step."
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-msgid "File name of your X.509 certificate in PEM format:"
+msgid "Use an existing X.509 certificate for strongSwan?"
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
 msgid ""
-"Please enter the full location of the file containing your X.509 certificate "
-"in PEM format."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-msgid "File name of your X.509 private key in PEM format:"
+msgid "File name of your X.509 certificate in PEM format:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
 msgid ""
-"Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
-msgid "The length of the created RSA key (in bits):"
+msgid "File name of your existing X.509 private key in PEM format:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
 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."
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-msgid "Do you want to create a self-signed X.509 certificate?"
+msgid "RSA key length:"
 msgstr ""
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
 msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:10001
-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 get the certificate request signed by your certificate "
-"authority."
-msgstr ""
-
-#. Type: string
-#. Description
 #: ../strongswan-starter.templates:11001
-msgid "Country code for the X.509 certificate request:"
+msgid "Create a self-signed X.509 certificate?"
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 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."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
-msgid "Example: AT"
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-msgid "State or province name for the X.509 certificate request:"
+msgid "Country code for the X.509 certificate request:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
-msgid "Locality name for the X.509 certificate request:"
+msgid "State or province name for the X.509 certificate request:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-msgid "Organization name for the X.509 certificate request:"
+msgid "Locality name for the X.509 certificate request:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-msgid "Organizational unit for the X.509 certificate request:"
+msgid "Organization name for the X.509 certificate request:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
+#: ../strongswan-starter.templates:16001
+msgid "Organizational unit for the X.509 certificate request:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-msgid "Common name for the X.509 certificate request:"
+msgid ""
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
+#: ../strongswan-starter.templates:17001
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 msgid "Email address for the X.509 certificate request:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter.templates:18001
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index d1ef08d12..081bf874a 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,610 +1,444 @@
-# Vietnamese translation for openswan.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Vietnamese translation for StrongSwan.
+# Copyright © 2009 Free Software Foundation, Inc.
 #
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2009, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: openswan 1/2.2.0-10\n"
+"Project-Id-Version: strongswan 4.2.14-20\n"
 "Report-Msgid-Bugs-To: strongswan@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-27 07:38+0100\n"
-"PO-Revision-Date: 2005-07-03 13:49+0930\n"
+"POT-Creation-Date: 2009-05-25 14:44+0100\n"
+"PO-Revision-Date: 2009-05-25 15:01+0100\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.2.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:1001
-msgid "earliest, \"after NFS\", \"after PCMCIA\""
-msgstr "sớm nhất, «sau NFS», «sau PCMCIA»"
+#: ../strongswan-starter.templates:2001
+msgid "earliest"
+msgstr "sớm nhất"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-#, fuzzy
-msgid "When to start strongSwan:"
-msgstr "Bạn có muốn khởi chạy lại trình Openswan không?"
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after NFS"
+msgstr "sau NFS"
 
 #. Type: select
-#. Description
-#: ../strongswan-starter.templates:1002
-#, fuzzy
-msgid ""
-"There are three possibilities when strongSwan can start: before or after the "
-"NFS services and after the PCMCIA services. The correct answer depends on "
-"your specific setup."
-msgstr ""
-"Trong những cấp khởi chạy Debian hiện thời (gần mọi trình khởi chạy trên cấp "
-"20), không thể đảm bảo trình Openswan sẽ khởi chạy vào điểm thời đúng. Có ba "
-"lúc có thể khởi chạy trình Openswan: lúc trước hay lúc sau dịch vụ NFS và "
-"lúc sau dịch vụ PCMCIA. Giá trị đúng phụ thuộc vào thiết lập riêng của bạn."
+#. Choices
+#: ../strongswan-starter.templates:2001
+msgid "after PCMCIA"
+msgstr "sau PCMCIA"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-#, fuzzy
-msgid ""
-"If you do not have your /usr tree mounted via NFS (either you only mount "
-"other, less vital trees via NFS or don't use NFS mounted trees at all) and "
-"don't use a PCMCIA network card, then it's best to start strongSwan at the "
-"earliest possible time, thus allowing the NFS mounts to be secured by IPSec. "
-"In this case (or if you don't understand or care about this issue), answer "
-"\"earliest\" to this question (the default)."
-msgstr ""
-"Nếu bạn không có cây «/usr» mình được gắn thông qua NFS (hoặc bạn chỉ gắn cây "
-"khác, ít quan trọng hơn, thông qua NFS, hoặc bạn không sử dụng cây do NFS "
-"gắn cách nào cả) và không sử dụng một thẻ mạng PCMCIA, thì tốt nhất là khởi "
-"chạy trình Openswan càng sớm càng có thể, mà cho phép IPSec bảo vệ những "
-"điểm gắn NFS. Trong trường hợp này (hoặc nếu bạn không hiểu được vấn đề này, "
-"hoặc không nghĩ nó là quan trọng) thì hãy trả lời «sớm nhất» (earliest: giá "
-"trị mặc định) cho câu hỏi này."
+#: ../strongswan-starter.templates:2002
+msgid "When to start strongSwan:"
+msgstr "StrongSwan nên khởi chạy khi nào :"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
-#, fuzzy
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you have your /usr tree mounted via NFS and don't use a PCMCIA network "
-"card, then you will need to start strongSwan after NFS so that all necessary "
-"files are available. In this case, answer \"after NFS\" to this question. "
-"Please note that the NFS mount of /usr can not be secured by IPSec in this "
-"case."
+"StrongSwan starts during system startup so that it can protect filesystems "
+"that are automatically mounted."
 msgstr ""
-"Nếu bạn có cây «/usr» mình được gắn thông qua NFS và không sử dụng một thẻ "
-"mạng PCMCIA, thì bạn sẽ cần phải khởi chạy Openswan sau NFS, để mọi tập tin "
-"cần thiết có sẵn sàng. Trong trường hợp này, hãy trả lời «sau NFS» (after "
-"NFS) cho câu hỏi này. Tuy nhiên, IPsec sẽ không thể bảo vệ điểm gắn của «/"
-"usr» trong trường hợp này."
+"StrongSwan khởi chạy trong tiến trình khởi động hệ thống, để bảo vệ những hệ "
+"thống tập tin được tự động gắn kết."
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:1002
+#: ../strongswan-starter.templates:2002
 msgid ""
-"If you use a PCMCIA network card for your IPSec connections, then you only "
-"have to choose to start it after the PCMCIA services. Answer \"after PCMCIA"
-"\" in this case. This is also the correct answer if you want to fetch keys "
-"from a locally running DNS server with DNSSec support."
+" * earliest: if /usr is not mounted through NFS and you don't use a\n"
+"   PCMCIA network card, it is best to start strongSwan as soon as\n"
+"   possible, so that NFS mounts can be secured by IPSec;\n"
+" * after NFS: recommended when /usr is mounted through NFS and no\n"
+"   PCMCIA network card is used;\n"
+" * after PCMCIA: recommended if the IPSec connection uses a PCMCIA\n"
+"   network card or if it needs keys to be fetched from a locally running "
+"DNS\n"
+"   server with DNSSec support."
 msgstr ""
-"Nếu bạn sử dụng thẻ PCMCIA để kết nối cách loại IPSec, thì chỉ hãy chọn khởi "
-"chạy FreeS/WAN sau những dịch vụ PCMCIA. Hãy trả lời «sau PCMCIA» trong "
-"trường hợp này. Trả lời này cũng đúng nếu bạn muốn gọi khóa từ một máy phục "
-"vụ DNS chạy địa phương có loại hỗ trợ DNSSec."
+" • sớm nhất\tNếu /usr không phải được gắn kết thông qua NFS,\n"
+"\t\t\tvà máy này không dùng bo mạch mạng PCMCIA,\n"
+"\t\t\tthì strongSwan nên khởi chạy sớm nhất có thể,\n"
+"\t\t\tđể IPSec bảo mật những điểm lắp NFS.\n"
+" • sau NFS\tNếu /usr có phải được gắn kết thông qua NFS,\n"
+"\t\t\tvà máy này không dùng bo mạch mạng PCMCIA.\n"
+" • sau PCMCIA\t\tNếu kết nối IPSec dùng bo mạch mạng PCMCIA,\n"
+"\t\t\t\thoặc nếu nó cần lấy khoá từ một trình phục vụ DNS\n"
+"\t\t\t\tchạy cục bộ có hỗ trợ DNSSec."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-#, fuzzy
-msgid "Do you wish to restart strongSwan?"
-msgstr "Bạn có muốn khởi chạy lại trình Openswan không?"
+#: ../strongswan-starter.templates:3001
+msgid "Restart strongSwan now?"
+msgstr "Khởi chạy lại strongSwan ngay bây giờ ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
-#, fuzzy
+#: ../strongswan-starter.templates:3001
 msgid ""
-"Restarting strongSwan is a good idea, since if there is a security fix, it "
-"will not be fixed until the daemon restarts. Most people expect the daemon "
-"to restart, so this is generally a good idea. However this might take down "
+"Restarting strongSwan is recommended, because if there is a security fix, it "
+"will not be applied until the daemon restarts. However, this might close "
 "existing connections and then bring them back up."
 msgstr ""
-"Khởi chạy lại trình Openswan là một ý kiến tốt, vì nó hiệu lực việc sửa bảo "
-"mật mới nào. Phần lớn người ngờ trình nền (dæmon) sẽ khởi chạy lại, thì nói "
-"chung làm như thế là một ý kiến tốt. Tuy nhiên, việc khởi chạy lại có thể "
-"ngắt các sự kết nối hiện thời, rồi kết nối chúng lại."
-
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates:3001
-#, fuzzy
-msgid "Do you wish to support IKEv1?"
-msgstr "Bạn có muốn khởi chạy lại trình Openswan không?"
+"Khuyên khởi chạy lại strongSwan, vì phần mềm giải quyết vấn đề bảo mật (nếu "
+"có) chỉ được hiệu lực khi trình nền khởi chạy lại. Ghi chú : hành vi khởi "
+"chạy lại cũng có thể đóng và mở lại kết nối đã có."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:3001
+#| msgid ""
+#| "If you don't restart strongSwan now, you should do so manually at the "
+#| "first  opportunity."
 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?"
+"If you don't restart strongSwan now, you should do so manually at the first "
+"opportunity."
 msgstr ""
+"Không khởi chạy lại strongSwan ngay bây giờ thì quản trị nên tự làm sớm nhất "
+"có thể."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:4001
-#, fuzzy
-msgid "Do you wish to support IKEv2?"
-msgstr "Bạn có muốn khởi chạy lại trình Openswan không?"
+msgid "Start strongSwan's IKEv1 daemon?"
+msgstr "Khởi chạy trình nền IKEv1 của strongSwan ?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates: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?"
+"The pluto daemon must be running to support version 1 of the Internet Key "
+"Exchange protocol."
 msgstr ""
+"Đồng thời cũng cần phải chạy trình nền pluto, để hỗ trợ phiên bản 1 của giao "
+"thức Trao Đổi Khoá Internet (IKE)."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-msgid "Do you want to create a RSA public/private keypair for this host?"
-msgstr "Bạn có muốn tạo một cặp khóa công/riêng RSA cho máy này không?"
+msgid "Start strongSwan's IKEv2 daemon?"
+msgstr "Khởi chạy trình nền IKEv2 của strongSwan ?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:5001
-#, fuzzy
-#| msgid ""
-#| "This installer can automatically create a RSA public/private keypair for "
-#| "this host. This keypair can be used to authenticate IPSec connections to "
-#| "other hosts and is the preferred way for building up secure IPSec "
-#| "connections. The other possibility would be to use shared secrets "
-#| "(passwords that are the same on both sides of the tunnel) for "
-#| "authenticating an connection, but for a larger number of connections RSA "
-#| "authentication is easier to administer and more secure."
 msgid ""
-"This installer can automatically create a RSA public/private keypair with an "
-"X.509 certificate for this host. This can be used to authenticate  IPSec "
-"connections to other hosts and is the preferred way for building up  secure "
-"IPSec connections. The other possibility would be to use pre-shared  secrets "
-"(PSKs, passwords that are the same on both sides of the tunnel) for "
-"authenticating an connection, but for a larger number of connections RSA "
-"authentication is easier to administer and more secure. Note that having a "
-"keypair allows to use both X.509 and PSK authentication for IPsec  tunnels."
+"The charon daemon must be running to support version 2 of the Internet Key "
+"Exchange protocol."
 msgstr ""
-"Trình cài đặt này có thể tự động tạo một cặp khóa công/riêng RSA cho máy "
-"này. Có thể sử dụng cặp khóa này để xác thực cách kết nối IPSec tới máy "
-"khác, và nó là cách ưa thích để xây dụng cách kết nối IPSec bảo mật. Hoặc có "
-"thể sử dụng «bí mật dùng chung» (shared secrets), mà có cùng một mật khẩu tại "
-"cả hai đầu và cuối đều đường hầm, để xác thực mỗi sự kết nối. Tuy nhiên, với "
-"sự kết nối rất nhiều, dễ hơn để sử dụng cách xác thực RSA và nó bảo mật hơn. "
+"Đồng thời cũng cần phải chạy trình nền charon, để hỗ trợ phiên bản 2 của "
+"giao thức Trao Đổi Khoá Internet (IKE)."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:5001
-#, fuzzy
-msgid ""
-"If you do not want to create a new public/private keypair, you can choose to "
-"use an existing one in the next step."
-msgstr "Bạn có muốn tạo một cặp khóa công/riêng RSA cho máy này không?"
+#: ../strongswan-starter.templates:6001
+msgid "Create an RSA public/private keypair for this host?"
+msgstr "Tạo một cặp khoá công/riêng RSA cho máy này ?"
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
-msgid "Do you have an existing X.509 certificate file for strongSwan?"
+msgid ""
+"StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate "
+"IPSec connections to other hosts. RSA authentication is generally considered "
+"more secure and is easier to administer. You can use PSK and RSA "
+"authentication simultaneously."
 msgstr ""
-"Bạn có một tập tin chứng nhận X509 mà bạn muốn sử dụng với trình Openswan "
-"chưa?"
+"StrongSwan có khả năng sử dụng một khoá chia sẻ sẵn (PSK) hay một cặp khoá "
+"RSA, để xác thức kết nối IPSec tới máy khác. Quá trình xác thức RSA thường "
+"được xem là bảo mật hơn, cũng dễ hơn quản trị. Có thể dùng đồng thời hai quá "
+"trình xác thực PSK và RSA."
 
 #. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:6001
-#, fuzzy
 msgid ""
-"This installer can automatically extract the needed information from an "
-"existing X.509 certificate with a matching RSA private key. Both parts can "
-"be in one file, if it is in PEM format. If you have such an existing "
-"certificate and key file and want to use it for authenticating IPSec "
-"connections, then please answer yes."
+"If you do not want to create a new public/private keypair, you can choose to "
+"use an existing one in the next step."
 msgstr ""
-"Trình cài đặt này có thể tự động giải mã thông tin cần thiết ra một chứng "
-"nhận X509 đã có, với khóa riêng RSA tương ứng. Cả hai điều có thể trong cùng "
-"một tập tin, nếu nó có dạng PEM. Bạn có chứng nhận đã có như vậy, và muốn sử "
-"dụng nó để xác thực cách kết nối IPSec không?"
+"Không muốn tạo một cặp khóa công/riêng mới thì bước kế tiếp cho bạn sử dụng "
+"một khoá đã có."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, fuzzy
-msgid "File name of your X.509 certificate in PEM format:"
-msgstr "Hãy nhập địa điểm của chứng nhận X509 của bạn, có dạng PEM."
+msgid "Use an existing X.509 certificate for strongSwan?"
+msgstr "Với strongSwan, dùng một chứng nhận X.509 đã có ?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:7001
-#, fuzzy
 msgid ""
-"Please enter the full location of the file containing your X.509 certificate "
-"in PEM format."
+"The required information can automatically be extracted from an existing "
+"X.509 certificate with a matching RSA private key. Both parts can be in one "
+"file, if it is in PEM format. You should choose this option if you have such "
+"an existing certificate and key file and want to use it for authenticating "
+"IPSec connections."
 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."
+"Thông tin yêu cầu có thể được tự động trích ra một chứng nhận X.509 đã tồn "
+"tại mà có một cặp khoá RSA riêng tương ứng. Cả hai phần có thể nằm trong "
+"cùng một tập tin theo định dạng PEM. Nếu bạn có tập tin như vậy chứa chứng "
+"nhận và khoá, và muốn dùng nó để xác thực kết nối IPSec, thì có nên bật tuỳ "
+"chọn này."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
-msgid "File name of your X.509 private key in PEM format:"
-msgstr "Hãy nhập địa điểm của khóa riêng X509 của bạn, có dạng PEM."
+msgid "File name of your X.509 certificate in PEM format:"
+msgstr "Tên tập tin chứng nhận X.509 có dạng PEM:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:8001
-#, fuzzy
 msgid ""
-"Please enter the full location of the file containing the private RSA key "
-"matching your X.509 certificate in PEM format. This can be the same file "
-"that contains the X.509 certificate."
+"Please enter the full location of the file containing your X.509 certificate "
+"in PEM format."
 msgstr ""
-"Hãy nhập địa điểm của tập tin chứa khóa RSA riêng khớp với chứng nhận X509 "
-"của bạn, có dạng PEM. Có thể là cùng một tập tin chứa chứng nhận X509."
+"Hãy nhập đường dẫn đầy đủ đến tập tin chứa chứng nhận X.509 của bạn, theo "
+"định dạng PEM."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
-#, fuzzy
-msgid "The length of the created RSA key (in bits):"
-msgstr "Khóa RSA mới được tạo nên có độ dài nào?"
+msgid "File name of your existing X.509 private key in PEM format:"
+msgstr "Tên tập tin khoá riêng X.509 có dạng PEM:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:9001
-#, 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 "
-"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."
+"Please enter the full location of the file containing the private RSA key "
+"matching your X.509 certificate in PEM format. This can be the same file as "
+"the X.509 certificate."
 msgstr ""
-"Hãy nhập độ dài của khóa RSA mới được tạo. Nên có ít nhất 1024 bit, vì khóa "
-"nào nhỏ hơn kích thước ấy không phải là bảo mật. Rất có thể là bạn sẽ không "
-"cần sử dụng độ dài hơn 2048 bit, vì nó chỉ giảm tốc độ tiến trình xác thực, "
-"và hiện thời không cần thiết."
+"Hãy nhập đường dẫn đầy đủ đến tập tin chứa khoá RSA riêng tương ứng với "
+"chứng nhận X.509 của bạn, theo định dạng PEM. (Đây có thể là cùng một tập "
+"tin với nó chứa chứng nhận X.509.)"
 
-#. Type: boolean
-#. Description
-#: ../strongswan-starter.templates:10001
-#, fuzzy
-msgid "Do you want to create a self-signed X.509 certificate?"
-msgstr "Bạn có muốn tạo một chứng nhận X509 tự ký không?"
-
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, fuzzy
-msgid ""
-"This installer can only create self-signed X.509 certificates automatically, "
-"because otherwise a certificate authority is needed to sign the certificate "
-"request. If you want to create a self-signed certificate, you can use it "
-"immediately to connect to other IPSec hosts that support X.509 certificate "
-"for authentication of IPSec connections. However, if you want to use the new "
-"PKI features of strongSwan >= 1.91, you will need to have all X.509 "
-"certificates signed by a single certificate authority to create a trust path."
-msgstr ""
-"Trình cài đặt này chỉ có thể tự động tạo chứng nhận X509 tự ký, vì nếu không "
-"thì một nhà cầm quyền chứng nhận (Certificate Authority, CA) phải ký lời yêu "
-"cầu chứng nhận ấy. Nếu bạn muốn tạo một chứng nhận tự ký, bạn có thể sử dụng "
-"nó ngay lập tức để kết nối đến máy IPSec khác có hỗ trợ sử dụng chứng nhận "
-"X509 để xác thực sự kết nối IPSec. Tuy nhiên, nếu bạn muốn sử dụng những "
-"tính năng PKI mới của trình Openswan phiên bản ≥1.91, bạn sẽ phải có tất cả "
-"những chứng nhận X509 được ký bởi một nhà cầm quyền chứng nhận riêng lẻ, để "
-"tạo một «đường dẫn tin cây» (trust path)."
+msgid "RSA key length:"
+msgstr "Độ dài khoá RSA:"
 
-#. Type: boolean
+#. Type: string
 #. Description
 #: ../strongswan-starter.templates:10001
-#, 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."
+#| "Please enter the length of RSA key you wish to generate. A value of less "
+#| "than  1024 bits is not considered secure. A value of more than 2048 bits "
+#| "will  probably affect performance."
 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 get the certificate request signed by your certificate "
-"authority."
+"Please enter the length of RSA key you wish to generate. A value of less "
+"than 1024 bits is not considered secure. A value of more than 2048 bits will "
+"probably affect performance."
 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 "
-"ấy dùng nhà cầm quyền chứng nhận bạn."
+"Hãy nhập chiều dài của khoá RSA bạn muốn tạo. Giá trị này nên nằm giữa 1024 "
+"và 2048 bit. Giá trị nhỏ hơn 1024 không phải được xem là bảo mật. Giá trị "
+"lớn hơn 2048 sẽ rất có thể giảm tốc độ chạy máy tính."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
-#, fuzzy
-msgid "Country code for the X.509 certificate request:"
-msgstr "Hãy nhập mã quốc gia cho lời yêu cầu chứng nhận X509."
+msgid "Create a self-signed X.509 certificate?"
+msgstr "Tạo một chứng nhận X.509 tự ký ?"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 msgid ""
-"Please enter the 2 letter country code for your country. This code will be "
-"placed in the certificate request."
+"Only self-signed X.509 certificates can be created automatically, because "
+"otherwise a certificate authority is needed to sign the certificate request."
 msgstr ""
-"Hãy nhập mã hai chữ cho quốc gia bạn. Sẽ chèn mã này vào lời yêu cầu chứng "
-"nhận."
+"Chỉ chứng nhận X.509 tự ký có thể được tự động tạo, vì chứng nhận loại khác "
+"yêu cầu chữ ký của một nhà cầm quyền cấp chứng nhận (CA)."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
 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."
+"If you accept this option, the certificate created can be used immediately "
+"to connect to other IPSec hosts that support authentication via an X.509 "
+"certificate. However, using strongSwan's PKI features requires a trust path "
+"to be created by having all X.509 certificates signed by a single authority."
 msgstr ""
-"Bạn thật cần phải nhập một mã quốc gia hợp lệ vào đây, vì trình OpenSSL sẽ "
-"từ chối tạo ra chứng nhận nào khi không có mã ấy. Có thể bỏ rỗng bất cứ "
-"trường nào khác cho chứng nhận X509, nhưng mà không phải trường này."
+"Bật tùy chọn này thì chứng nhận đã tạo có thể được sử dụng ngay lập tức để "
+"kết nối tới máy IPSec khác mà hỗ trợ xác thực thông qua một chứng nhận "
+"X.509. Tuy nhiên, để sử dụng tính năng PKI của strongSwan cũng cần phải tạo "
+"một đường dẫn tin cậy (tất cả các chứng nhận X.509 được ký bởi cùng một nhà "
+"cầm quyền)."
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../strongswan-starter.templates:11001
-msgid "Example: AT"
-msgstr "Lấy thí dụ: VN"
+#| msgid ""
+#| "If you do not accept this option, only the RSA private key will be "
+#| "created, along with a certificate request which you will need to have "
+#| "signed by a  certificate authority."
+msgid ""
+"If you do not accept this option, only the RSA private key will be created, "
+"along with a certificate request which you will need to have signed by a "
+"certificate authority."
+msgstr ""
+"Không bật tuỳ chọn này thì chỉ khoá riêng RSA sẽ được tạo, cùng với một lời "
+"yêu cầu chứng nhận cho bạn xin chữ ký của một nhà cầm quyền cấp chứng nhận "
+"(CA)."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-#, fuzzy
-msgid "State or province name for the X.509 certificate request:"
-msgstr "Hãy nhập tên bảng hay tỉnh cho lời yêu cầu chứng nhận X509."
+msgid "Country code for the X.509 certificate request:"
+msgstr "Mã quốc gia cho lời yêu cầu chứng nhận X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
 msgid ""
-"Please enter the full name of the state or province you live in. This name "
-"will be placed in the certificate request."
+"Please enter the two-letter ISO3166 country code that should be used in the "
+"certificate request."
 msgstr ""
-"Hãy nhập tên đầy đủ của bang hay tỉnh nơi bạn ở. Sẽ chèn tên này vào lời yêu "
+"Hãy nhập mã quốc gia hai chữ ISO-3166 (v.d. « vn ») của chỗ bạn, cho lời yêu "
 "cầu chứng nhận."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:12001
-msgid "Example: Upper Austria"
-msgstr "Lấy thí dụ: Bình Định"
+msgid "This field is mandatory; otherwise a certificate cannot be generated."
+msgstr "Không điền vào trường này thì không thể tạo chứng nhận."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
-#, fuzzy
-msgid "Locality name for the X.509 certificate request:"
-msgstr "Hãy nhập tên địa phương cho lời yêu cầu chứng nhận X509."
+msgid "State or province name for the X.509 certificate request:"
+msgstr "Tên của bảng hay tỉnh cho lời yêu cầu chứng nhận X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:13001
 msgid ""
-"Please enter the locality (e.g. city) where you live. This name will be "
-"placed in the certificate request."
+"Please enter the full name of the state or province to include in the "
+"certificate request."
 msgstr ""
-"Hãy nhập địa phương (v.d. thành phố) nơi bạn ở. Sẽ chèn tên này vào lời yêu "
+"Hãy nhập tên đầy đủ của bang hay tỉnh nơi bạn ở, để bao gồm trong lời yêu "
 "cầu chứng nhận."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
-msgid "Example: Vienna"
-msgstr "Lấy thí dụ: Quy Nhơn"
-
-#. Type: string
-#. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-msgid "Organization name for the X.509 certificate request:"
-msgstr "Hãy nhập tên tổ chức cho lời yêu cầu chứng nhận X509."
+msgid "Locality name for the X.509 certificate request:"
+msgstr "Tên vùng cho lời yêu cầu chứng nhận X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:14001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organization (e.g. company) that the X.509 certificate "
-"should be created for. This name will be placed in the certificate request."
+"Please enter the locality name (often a city) that should be used in the "
+"certificate request."
 msgstr ""
-"Hãy nhập tổ chức (v.d. công ty) cho mà chứng nhận X509 nên được tạo. Sẽ chèn "
-"tên này vào lời yêu cầu chứng nhận."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:14001
-msgid "Example: Debian"
-msgstr "Lấy thí dụ: Debian"
+"Hãy nhập tên vùng (v.d. thành phố) nên dùng trong lời yêu cầu chứng nhận."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-msgid "Organizational unit for the X.509 certificate request:"
-msgstr "Hãy nhập tên đơn vị tổ chức cho lời yêu cầu chứng nhận X509."
+msgid "Organization name for the X.509 certificate request:"
+msgstr "Tên tổ chức cho lời yêu cầu chứng nhận X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:15001
-#, fuzzy
-#| 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."
 msgid ""
-"Please enter the organizational unit (e.g. section) that the X.509 "
-"certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organization name (often a company) that should be used in "
+"the certificate request."
 msgstr ""
-"Hãy nhập đơn vị tổ chức (v.d. phần) cho mà chứng nhận X509 nên được tạo. Sẽ "
-"chèn tên này vào lời yêu cầu chứng nhận."
-
-#. Type: string
-#. Description
-#: ../strongswan-starter.templates:15001
-msgid "Example: security group"
-msgstr "Lấy thí dụ: nhóm Việt hóa"
+"Hãy nhập tên tổ chức (v.d. công ty, trường học) nên dùng trong yêu cầu chứng "
+"nhận."
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
-msgid "Common name for the X.509 certificate request:"
-msgstr "Hãy nhập tên chung cho lời yêu cầu chứng nhận X509."
+msgid "Organizational unit for the X.509 certificate request:"
+msgstr "Tên đơn vị tổ chức cho lời yêu cầu chứng nhận X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:16001
-#, fuzzy
 #| 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."
+#| "Please enter the organizational unit name (often a department)  that "
+#| "should be used in the certificate request."
 msgid ""
-"Please enter the common name (e.g. the host name of this machine) for which "
-"the X.509 certificate should be created for. This name will be placed in the "
-"certificate request."
+"Please enter the organizational unit name (often a department) that should "
+"be used in the certificate request."
 msgstr ""
-"Hãy nhập tên chung (v.d. tên máy) cho mà chứng nhận X509 nên được tạo. Sẽ "
-"chèn tên này vào lời yêu cầu chứng nhận."
+"Hãy nhập đơn vị tổ chức (v.d. phòng ban, khoa) nên dùng trong yêu cầu chứng "
+"nhận."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
-msgid "Example: gateway.debian.org"
-msgstr "Lấy thí cụ: gateway.debian.org"
+#: ../strongswan-starter.templates:17001
+msgid "Common name for the X.509 certificate request:"
+msgstr "Tên chung cho lời yêu cầu chứng nhận X.509:"
 
 #. Type: string
 #. Description
 #: ../strongswan-starter.templates:17001
-#, fuzzy
+msgid ""
+"Please enter the common name (such as the host name of this machine) that "
+"should be used in the certificate request."
+msgstr ""
+"Hãy nhập tên chung (v.d. tên máy của máy tính này) nên dùng trong yêu cầu "
+"chứng nhận."
+
+#. Type: string
+#. Description
+#: ../strongswan-starter.templates:18001
 msgid "Email address for the X.509 certificate request:"
-msgstr "Hãy nhập địa chỉ thư điện tử chung cho lời yêu cầu chứng nhận X509."
+msgstr "Địa chỉ thư cho lời yêu cầu chứng nhận X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:17001
-#, fuzzy
-#| 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 "
-#| "certificate request."
+#: ../strongswan-starter.templates:18001
 msgid ""
-"Please enter the email address of the person or organization who is "
-"responsible for the X.509 certificate. This address will be placed in the "
-"certificate request."
+"Please enter the email address (for the individual or organization "
+"responsible) that should be used in the certificate request."
 msgstr ""
-"Hãy nhập địa chỉ thư điện tử của người hay tổ chức chịu trách nhiệm về chứng "
-"nhận X509 này. Sẽ chèn địa chỉ này vào lời yêu cầu chứng nhận."
+"Hãy nhập địa chỉ thư điện tử (của người hay tổ chức chịu trách nhiệm về yêu "
+"cầu này) nên dùng trong yêu cầu chứng nhận."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-#, fuzzy
-msgid "Do you wish to enable opportunistic encryption in strongSwan?"
-msgstr ""
-"Bạn có muốn hiệu lực mật mã loại cơ hội chủ nghĩa trong trình Openswan không?"
+#: ../strongswan-starter.templates:19001
+msgid "Enable opportunistic encryption?"
+msgstr "Bật mật mã cơ hội chủ nghĩa ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
-#, fuzzy
+#: ../strongswan-starter.templates:19001
 msgid ""
-"strongSwan comes with support for opportunistic encryption (OE), which "
-"stores IPSec authentication information (i.e. RSA public keys) in "
-"(preferably secure) DNS records. Until this is widely deployed, activating "
-"it will cause a significant slow-down for every new, outgoing connection. "
-"Since version 2.0, strongSwan upstream comes with OE enabled by default and "
-"is thus likely to break your existing connection to the Internet (i.e. your "
-"default route) as soon as pluto (the strongSwan keying daemon) is started."
+"This version of strongSwan supports opportunistic encryption (OE), which "
+"stores IPSec authentication information in DNS records. Until this is widely "
+"deployed, activating it will cause a significant delay for every new "
+"outgoing connection."
 msgstr ""
-"Trình Openswan hỗ trợ có sẵn mật mã cơ hội chủ nghĩa (OE: opportunistic "
-"encryption) mà cất giữ thông tin xác thực IPSec (tức là khóa công RSA) trong "
-"mục ghi DNS (thích hơn loại bảo mật). Cho đến khi tính năng này thường dụng, "
-"hoạt hóa nó sẽ giảm một cách quan trọng mỗi sự kết nối ra mới. Từ phiên bản "
-"2.0, trình Openswan gốc đã hiệu lực OE theo mặc định, thì sẽ rất có thể ngắt "
-"sự kết nối hiện thời đến Mạng của bạn (tức là đường mặc định) một khi khởi "
-"chạy pluto (trình nền quản lý khóa Openswan)."
+"Phiên bản strongSwan này hỗ trợ mật mã cơ hội chủ nghĩa (OE) mà cất giữ "
+"thông tin xác thực IPSec trong mục ghi DNS. Chức năng này chưa phổ biến thì "
+"vẫn còn làm trễ mỗi kết nối mới gửi đi."
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:18001
+#: ../strongswan-starter.templates:19001
 msgid ""
-"Please choose whether you want to enable support for OE. If unsure, do not "
-"enable it."
+"You should only enable opportunistic encryption if you are sure you want it. "
+"It may break the Internet connection (default route) as the pluto daemon "
+"starts."
 msgstr ""
-"Hãy chọn có nên muốn hiệu lực hỗ trợ OE hay không. Nếu chưa chắc thì đừng "
-"bật nó."
-
-#~ msgid "x509, plain"
-#~ msgstr "x509, giản dị"
-
-#, fuzzy
-#~ msgid "The type of RSA keypair to create:"
-#~ msgstr "Bạn có muốn tạo cặp khóa RSA loại nào?"
-
-#, fuzzy
-#~ 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 ""
-#~ "Có thể tạo một cặp khóa công/riêng RSA thô để sử dụng với trình Openswan, "
-#~ "hoặc tạo một tập tin chứng nhận X509 chứa khóa công RSA ấy và cũng cất "
-#~ "giữ khóa riêng tương ứng."
-
-#, fuzzy
-#~ 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 "
-#~ "want to connect to other IPSec implementations, you will need a X509 "
-#~ "certificate. It is also possible to create a X509 certificate here and "
-#~ "extract the RSA public key in plain format if the other side runs "
-#~ "strongSwan without X509 certificate support."
-#~ msgstr ""
-#~ "Nếu bạn chỉ muốn xây dụng sự kết nối IPSec đến máy cũng chạy trình "
-#~ "Openswan, có thể dễ dàng hơn khi sử dụng cặp khóa RSA thô. Còn nếu bạn "
-#~ "muốn kết nối đến một sự thực hiện IPSec khác, thì bạn sẽ cần có một chứng "
-#~ "nhận loại X509. Cũng có thể tạo một chứng nhận X509 tại đây, rồi rút khóa "
-#~ "công RSA có dạng thô, nếu bên khác có chạy trình Openswan không có hỗ trợ "
-#~ "chứng nhận X509."
-
-#, fuzzy
-#~ 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 "
-#~ "certificate and its use in strongSwan anyway."
-#~ msgstr ""
-#~ "Vì vậy khuyến khích một chứng nhận X509, vì nó dẻo hơn và trình cài đặt "
-#~ "này nên có thể ẩn việc phức tạp tạo chứng nhận X509 và cách dùng nó trong "
-#~ "trình Openswan."
-
-#, fuzzy
-#~ msgid "Please choose the when to start strongSwan:"
-#~ msgstr "Bạn có muốn khởi chạy lại trình Openswan không?"
-
-#, fuzzy
-#~ msgid "At which level do you wish to start strongSwan ?"
-#~ msgstr "Bạn có muốn khởi chạy trình Openswan tại cấp nào?"
+"Chưa chắc thì không nên hiệu lực chức năng mật mã cơ hội chủ nghĩa. Nó cũng "
+"có thể đóng kết nối Internet (đường dẫn mặc định) do trình nền pluto khởi "
+"chạy."
diff --git a/debian/strongswan-starter.templates b/debian/strongswan-starter.templates
index 781773ac5..8d239c271 100644
--- a/debian/strongswan-starter.templates
+++ b/debian/strongswan-starter.templates
@@ -1,68 +1,62 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: strongswan/start_level
 Type: select
-_Choices: earliest, "after NFS", "after PCMCIA"
+__Choices: earliest, after NFS, after PCMCIA
 Default: earliest
 _Description: When to start strongSwan:
- There are three possibilities when strongSwan can start: before or
- after the NFS services and after the PCMCIA services. The correct answer
- depends on your specific setup.
- .
- If you do not have your /usr tree mounted via NFS (either you only mount
- other, less vital trees via NFS or don't use NFS mounted trees at all) and
- don't use a PCMCIA network card, then it's best to start strongSwan at
- the earliest possible time, thus allowing the NFS mounts to be secured by
- IPSec. In this case (or if you don't understand or care about this
- issue), answer "earliest" to this question (the default).
- .
- If you have your /usr tree mounted via NFS and don't use a PCMCIA network
- card, then you will need to start strongSwan after NFS so that all
- necessary files are available. In this case, answer "after NFS" to this
- question. Please note that the NFS mount of /usr can not be secured by
- IPSec in this case.
+ StrongSwan starts during system startup so that it can protect filesystems
+ that are automatically mounted.
  .
- If you use a PCMCIA network card for your IPSec connections, then you only
- have to choose to start it after the PCMCIA services. Answer "after
- PCMCIA" in this case. This is also the correct answer if you want to fetch
- keys from a locally running DNS server with DNSSec support.
+  * earliest: if /usr is not mounted through NFS and you don't use a
+    PCMCIA network card, it is best to start strongSwan as soon as
+    possible, so that NFS mounts can be secured by IPSec;
+  * after NFS: recommended when /usr is mounted through NFS and no
+    PCMCIA network card is used;
+  * after PCMCIA: recommended if the IPSec connection uses a PCMCIA
+    network card or if it needs keys to be fetched from a locally running DNS
+    server with DNSSec support.
 
 Template: strongswan/restart
 Type: boolean
 Default: true
-_Description: Do you wish to restart strongSwan?
- Restarting strongSwan is a good idea, since if there is a security fix, it
- will not be fixed until the daemon restarts. Most people expect the daemon
- to restart, so this is generally a good idea. However this might take down
+_Description: Restart strongSwan now?
+ Restarting strongSwan is recommended, because if there is a security fix, it
+ will not be applied until the daemon restarts. However, this might close
  existing connections and then bring them back up.
+ .
+ If you don't restart strongSwan now, you should do so manually at the first
+ opportunity.
 
 Template: strongswan/ikev1
 Type: boolean
 Default: true
-_Description: Do you wish to support IKEv1?
- 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?
+_Description: Start strongSwan's IKEv1 daemon?
+ The pluto daemon must be running to support version 1 of the Internet Key
+ Exchange protocol.
 
 Template: strongswan/ikev2
 Type: boolean
 Default: true
-_Description: Do you wish to support IKEv2?
- 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?
+_Description: Start strongSwan's IKEv2 daemon?
+ The charon daemon must be running to support version 2 of the Internet Key
+ Exchange protocol.
 
 Template: strongswan/create_rsa_key
 Type: boolean
 Default: true
-_Description: Do you want to create a RSA public/private keypair for this host?
- This installer can automatically create a RSA public/private keypair
- with an X.509 certificate for this host. This can be used to authenticate 
- IPSec connections to other hosts and is the preferred way for building up 
- secure IPSec connections. The other possibility would be to use pre-shared 
- secrets (PSKs, passwords that are the same on both sides of the tunnel) for
- authenticating an connection, but for a larger number of connections RSA
- authentication is easier to administer and more secure. Note that
- having a keypair allows to use both X.509 and PSK authentication for IPsec 
- tunnels.
+_Description: Create an RSA public/private keypair for this host?
+ StrongSwan can use a Pre-Shared Key (PSK) or an RSA keypair to authenticate
+ IPSec connections to other hosts. RSA authentication is generally considered
+ more secure and is easier to administer. You can use PSK and RSA authentication
+ simultaneously.
  .
  If you do not want to create a new public/private keypair, you can choose to
  use an existing one in the next step.
@@ -70,12 +64,13 @@ _Description: Do you want to create a RSA public/private keypair for this host?
 Template: strongswan/existing_x509_certificate
 Type: boolean
 Default: false
-_Description: Do you have an existing X.509 certificate file for strongSwan?
- This installer can automatically extract the needed information from an
+_Description: Use an existing X.509 certificate for strongSwan?
+ The required information can automatically be extracted from an
  existing X.509 certificate with a matching RSA private key. Both parts can
- be in one file, if it is in PEM format. If you have such an existing
+ be in one file, if it is in PEM format.
+ You should choose this option if you have such an existing
  certificate and key file and want to use it for authenticating IPSec
- connections, then please answer yes.
+ connections.
 
 Template: strongswan/existing_x509_certificate_filename
 Type: string
@@ -85,118 +80,97 @@ _Description: File name of your X.509 certificate in PEM format:
 
 Template: strongswan/existing_x509_key_filename
 Type: string
-_Description: File name of your X.509 private key in PEM format:
+_Description: File name of your existing X.509 private key in PEM format:
  Please enter the full location of the file containing the private RSA key
  matching your X.509 certificate in PEM format. This can be the same file
- that contains the X.509 certificate.
+ as the X.509 certificate.
 
 Template: strongswan/rsa_key_length
 Type: string
 Default: 2048
-_Description: The length of the created RSA key (in bits):
- 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.
+_Description: RSA key length:
+ Please enter the length of RSA key you wish to generate. A value of less than
+ 1024 bits is not considered secure. A value of more than 2048 bits will
+ probably affect performance.
 
 Template: strongswan/x509_self_signed
 Type: boolean
 Default: true
-_Description: Do you want to create a self-signed X.509 certificate?
- This installer can only create self-signed X.509 certificates
+_Description: Create a self-signed X.509 certificate?
+ Only self-signed X.509 certificates can be created
  automatically, because otherwise a certificate authority is needed to sign
- the certificate request. If you want to create a self-signed certificate,
- you can use it immediately to connect to other IPSec hosts that support
- X.509 certificate for authentication of IPSec connections. However, if you
- want to use the new PKI features of strongSwan >= 1.91, you will need to
- have all X.509 certificates signed by a single certificate authority to
- create a trust path.
+ the certificate request.
  .
- 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 get the certificate request signed by your certificate
+ If you accept this option, the certificate created can be used
+ immediately to connect to other IPSec hosts that support authentication via
+ an X.509 certificate. However, using strongSwan's PKI features requires a
+ trust path to be created by having all X.509 certificates signed by a single
  authority.
+ .
+ If you do not accept this option, only the RSA private key will be created,
+ along with a certificate request which you will need to have signed by a
+ certificate authority.
 
 Template: strongswan/x509_country_code
 Type: string
 Default: AT
 _Description: Country code for the X.509 certificate request:
- Please enter the 2 letter country code for your country. This code will be
- placed in the certificate request. 
- .
- 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.
+ Please enter the two-letter ISO3166 country code that should be
+ used in the certificate request.
  .
- Example: AT
+ This field is mandatory; otherwise a certificate cannot be generated.
 
 Template: strongswan/x509_state_name
 Type: string
 Default:
 _Description: State or province name for the X.509 certificate request:
- Please enter the full name of the state or province you live in. This name
- will be placed in the certificate request.
- .
- Example: Upper Austria
+ Please enter the full name of the state or province to include in
+ the certificate request.
 
 Template: strongswan/x509_locality_name
 Type: string
 Default: 
 _Description: Locality name for the X.509 certificate request:
- Please enter the locality (e.g. city) where you live. This name will be
- placed in the certificate request.
- .
- Example: Vienna
+ Please enter the locality name (often a city)
+ that should be used in the certificate request.
 
 Template: strongswan/x509_organization_name
 Type: string
 Default: 
 _Description: Organization name for the X.509 certificate request:
- Please enter the organization (e.g. company) that the X.509 certificate
- should be created for. This name will be placed in the certificate
- request.
- .
- Example: Debian
+ Please enter the organization name (often a company)
+ that should be used in the certificate request.
 
 Template: strongswan/x509_organizational_unit
 Type: string
 Default: 
 _Description: Organizational unit for the X.509 certificate request:
- Please enter the organizational unit (e.g. section) that the X.509
- certificate should be created for. This name will be placed in the
- certificate request.
- .
- Example: security group
+ Please enter the organizational unit name (often a department)
+ that should be used in the certificate request.
 
 Template: strongswan/x509_common_name
 Type: string
 Default: 
 _Description: Common name for the X.509 certificate request:
- Please enter the common name (e.g. the host name of this machine) for
- which the X.509 certificate should be created for. This name will be placed
- in the certificate request.
- .
- Example: gateway.debian.org
+ Please enter the common name (such as the host name of this machine)
+ that should be used in the certificate request.
 
 Template: strongswan/x509_email_address
 Type: string
 Default: 
 _Description: Email address for the X.509 certificate request:
- Please enter the email address of the person or organization who is
- responsible for the X.509 certificate. This address will be placed in the
- certificate request.
+ Please enter the email address (for the individual or organization responsible)
+ that should be used in the certificate request.
 
 Template: strongswan/enable-oe
 Type: boolean
 Default: false
-_Description: Do you wish to enable opportunistic encryption in strongSwan?
- strongSwan comes with support for opportunistic encryption (OE), which stores
- IPSec authentication information (i.e. RSA public keys) in (preferably
- secure) DNS records. Until this is widely deployed, activating it will
- cause a significant slow-down for every new, outgoing connection. Since
- version 2.0, strongSwan upstream comes with OE enabled by default and is thus
- likely to break your existing connection to the Internet (i.e. your default
- route) as soon as pluto (the strongSwan keying daemon) is started.
+_Description: Enable opportunistic encryption?
+ This version of strongSwan supports opportunistic encryption (OE), which stores
+ IPSec authentication information in
+ DNS records. Until this is widely deployed, activating it will
+ cause a significant delay for every new outgoing connection.
  .
- Please choose whether you want to enable support for OE. If unsure, do not
- enable it.
+ You should only enable opportunistic encryption if you are sure you want it.
+ It may break the Internet connection (default route) as the pluto daemon
+ starts.
diff --git a/src/charon/sa/ike_sa.c b/src/charon/sa/ike_sa.c
index 6acbc6eef..bebd74160 100644
--- a/src/charon/sa/ike_sa.c
+++ b/src/charon/sa/ike_sa.c
@@ -1438,6 +1438,11 @@ static status_t process_message(private_ike_sa_t *this, message_t *message)
 			 exchange_type_names, message->get_exchange_type(message),
 			 message->get_request(message) ? "request" : "response",
 			 message->get_message_id(message));
+		
+		if (this->state == IKE_CREATED)
+		{	/* invalid initiation attempt, close SA */
+			return DESTROY_ME;
+		}
 		return status;
 	}
 	else
diff --git a/src/charon/sa/tasks/child_create.c b/src/charon/sa/tasks/child_create.c
index f6043979f..c07cd37b8 100644
--- a/src/charon/sa/tasks/child_create.c
+++ b/src/charon/sa/tasks/child_create.c
@@ -1137,11 +1137,11 @@ static void destroy(private_child_create_t *this)
 {
 	chunk_free(&this->my_nonce);
 	chunk_free(&this->other_nonce);
-	if (this->tsi)
+	if (this->tsr)
 	{
 		this->tsr->destroy_offset(this->tsr, offsetof(traffic_selector_t, destroy));
 	}
-	if (this->tsr)
+	if (this->tsi)
 	{
 		this->tsi->destroy_offset(this->tsi, offsetof(traffic_selector_t, destroy));
 	}
diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c
index 8b9762777..56dedb036 100644
--- a/src/libstrongswan/asn1/asn1.c
+++ b/src/libstrongswan/asn1/asn1.c
@@ -261,6 +261,11 @@ u_int asn1_length(chunk_t *blob)
 		len = 256*len + *blob->ptr++;
 		blob->len--;
 	}
+	if (len > blob->len)
+	{
+		DBG2("length is larger than remaining blob size");
+		return ASN1_INVALID_LENGTH;
+	}
 	return len;
 }
 
@@ -283,14 +288,20 @@ time_t asn1_to_time(const chunk_t *utctime, asn1_t type)
 	{
 		int tz_hour, tz_min;
 	
-		sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min);
+		if (sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min) != 2)
+		{
+			return 0; /* error in positive timezone offset format */
+		}
 		tz_offset = 3600*tz_hour + 60*tz_min;  /* positive time zone offset */
 	}
 	else if ((eot = memchr(utctime->ptr, '-', utctime->len)) != NULL)
 	{
 		int tz_hour, tz_min;
 	
-		sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min);
+		if (sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min) != 2)
+		{
+			return 0; /* error in negative timezone offset format */
+		}
 		tz_offset = -3600*tz_hour - 60*tz_min;  /* negative time zone offset */
 	}
 	else
@@ -303,14 +314,20 @@ time_t asn1_to_time(const chunk_t *utctime, asn1_t type)
 		const char* format = (type == ASN1_UTCTIME)? "%2d%2d%2d%2d%2d":
 													 "%4d%2d%2d%2d%2d";
 	
-		sscanf(utctime->ptr, format, &t.tm_year, &t.tm_mon, &t.tm_mday,
-			   						 &t.tm_hour, &t.tm_min);
+		if (sscanf(utctime->ptr, format, &t.tm_year, &t.tm_mon, &t.tm_mday,
+										 &t.tm_hour, &t.tm_min) != 5)
+		{
+			return 0; /* error in time st [yy]yymmddhhmm time format */
+		}
 	}
 	
 	/* is there a seconds field? */
 	if ((eot - utctime->ptr) == ((type == ASN1_UTCTIME)?12:14))
 	{
-		sscanf(eot-2, "%2d", &t.tm_sec);
+		if (sscanf(eot-2, "%2d", &t.tm_sec) != 1)
+		{
+			return 0; /* error in ss seconds field format */
+		}
 	}
 	else
 	{
diff --git a/src/libstrongswan/asn1/asn1_parser.c b/src/libstrongswan/asn1/asn1_parser.c
index 7a2028fc3..7ea9ace4f 100644
--- a/src/libstrongswan/asn1/asn1_parser.c
+++ b/src/libstrongswan/asn1/asn1_parser.c
@@ -160,7 +160,7 @@ static bool iterate(private_asn1_parser_t *this, int *objectID, chunk_t *object)
 	
 	blob1->len = asn1_length(blob);
 	
-	if (blob1->len == ASN1_INVALID_LENGTH || blob->len < blob1->len)
+	if (blob1->len == ASN1_INVALID_LENGTH)
 	{
 		DBG1("L%d - %s:  length of ASN.1 object invalid or too large", 
 					level, obj.name);
diff --git a/src/pluto/asn1.c b/src/pluto/asn1.c
index 529f597fb..6f3695874 100644
--- a/src/pluto/asn1.c
+++ b/src/pluto/asn1.c
@@ -191,6 +191,13 @@ asn1_length(chunk_t *blob)
 	len = 256*len + *blob->ptr++;
 	blob->len--;
     }
+    if (len > blob->len)
+    {
+	DBG(DBG_PARSING,
+	    DBG_log("length is larger than remaining blob size")
+	)
+	return ASN1_INVALID_LENGTH;
+    }
     return len;
 }
 
@@ -368,14 +375,20 @@ asn1totime(const chunk_t *utctime, asn1_t type)
     {
 	int tz_hour, tz_min;
 
-	sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min);
+	if (sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min) != 2)
+	{
+	    return 0; /* error in positive timezone offset format */
+	}
 	tz_offset = 3600*tz_hour + 60*tz_min;  /* positive time zone offset */
     }
     else if ((eot = memchr(utctime->ptr, '-', utctime->len)) != NULL)
     {
 	int tz_hour, tz_min;
 
-	sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min);
+	if (sscanf(eot+1, "%2d%2d", &tz_hour, &tz_min) != 2)
+	{
+	    return 0; /* error in negative timezone offset format */
+	}
 	tz_offset = -3600*tz_hour - 60*tz_min;  /* negative time zone offset */
     }
     else
@@ -388,14 +401,20 @@ asn1totime(const chunk_t *utctime, asn1_t type)
 	const char* format = (type == ASN1_UTCTIME)? "%2d%2d%2d%2d%2d":
 						     "%4d%2d%2d%2d%2d";
 
-	sscanf(utctime->ptr, format, &t.tm_year, &t.tm_mon, &t.tm_mday,
-				     &t.tm_hour, &t.tm_min);
-    }
+	if (sscanf(utctime->ptr, format, &t.tm_year, &t.tm_mon, &t.tm_mday,
+					 &t.tm_hour, &t.tm_min) != 5)
+	{
+	    return 0; /* error in time st [yy]yymmddhhmm time format */
+	}
+   }
 
     /* is there a seconds field? */
     if ((eot - utctime->ptr) == ((type == ASN1_UTCTIME)?12:14))
     {
-	sscanf(eot-2, "%2d", &t.tm_sec);
+	if (sscanf(eot-2, "%2d", &t.tm_sec) != 1)
+	{
+	    return 0; /* error in ss seconds field format */
+	}
     }
     else
     {
@@ -592,7 +611,7 @@ extract_object(asn1Object_t const *objects,
 
     blob1->len = asn1_length(blob);
 
-    if (blob1->len == ASN1_INVALID_LENGTH || blob->len < blob1->len)
+    if (blob1->len == ASN1_INVALID_LENGTH)
     {
 	DBG(DBG_PARSING,
 	    DBG_log("L%d - %s:  length of ASN.1 object invalid or too large",