- Updated translations.

- Import NMU patches.

1 files changed, 120 insertions, 167 deletions

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 ""