- Updated translations.

- Import NMU patches.

1 files changed, 387 insertions, 355 deletions

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 のサポートを有効にするかどうかを選んでください。よくわからない場合は、"
+#~ "有効にはしないでください。"