From 7cb81bb3ef2769812678719d440aa844c0bb889a Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 5 Mar 2007 10:22:56 +0000
Subject: Preparing 1.4.7

---
 po/ja.po | 1117 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 563 insertions(+), 554 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/ja.po b/po/ja.po
index e1bcd86a7..d9df4c962 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -43,10 +43,10 @@ msgstr "
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,9 +79,9 @@ msgstr "
 msgid "note: random_seed file not updated\n"
 msgstr "注意: random_seed ファイルの更新をしません\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "「%s」が作成できません: %s\n"
@@ -390,14 +390,14 @@ msgstr "OpenPGP
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGPカードno. %sを検出\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "それはバッチ・モードではできません\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "選択は? "
 
@@ -563,8 +563,8 @@ msgstr "   (2) 
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 認証鍵\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無効な選択です。\n"
 
@@ -584,7 +584,7 @@ msgstr "
 msgid "secret key already stored on a card\n"
 msgstr "秘密鍵はもうカードに保管してあります\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "このメニューを終了"
 
@@ -592,7 +592,7 @@ msgstr "
 msgid "show admin commands"
 msgstr "管理コマンドを表示"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "このヘルプを表示"
 
@@ -644,7 +644,7 @@ msgstr "PIN
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "コマンド> "
 
@@ -660,7 +660,7 @@ msgstr "
 msgid "Admin commands are not allowed\n"
 msgstr "管理コマンドは禁止されています\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無効なコマンド (“help”を参照)\n"
 
@@ -717,7 +717,7 @@ msgstr "PIN
 msgid "PIN not correctly repeated; try again"
 msgstr "PINをちゃんと繰り返していません。再入力してください"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -727,7 +727,7 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "このコマンドで--outputは機能しません\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -773,7 +773,7 @@ msgstr "
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "まず“--delete-secret-keys”オプションでこれを削除してください。\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "パスフレーズの作成エラー: %s\n"
@@ -839,12 +839,12 @@ msgstr "%s
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s暗号化 受信者:“%s”\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s暗号化済みデータ\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "未知のアルゴリズム%dによる暗号化\n"
@@ -982,7 +982,7 @@ msgstr "
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 何も書き出していません\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -990,127 +990,127 @@ msgstr ""
 "@コマンド:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[ファイル]|署名を作成"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[ファイル]|クリア署名を作成"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "分離署名を作成"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "データを暗号化"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "暗号化には対称暗号法のみを使用"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "データを復号 (既定)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "署名を検証"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "鍵の一覧"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "鍵と署名の一覧"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "鍵署名の検査と一覧"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "鍵と指紋の一覧"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "秘密鍵の一覧"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "新しい鍵対を生成"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "公開鍵輪から鍵群を削除"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "秘密鍵輪から鍵群を削除"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "鍵に署名"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "鍵へ内部的に署名"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "鍵への署名や編集"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "失効証明書を生成"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "鍵を書き出す"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "鍵サーバーに鍵を書き出す"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "鍵サーバーから鍵を読み込む"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "鍵サーバーの鍵を検索する"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "鍵サーバーから鍵を全部更新する"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "鍵の読込み/併合"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "カード状態を表示"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "カードのデータを変更"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "カードのPINを変更"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "信用データベースを更新"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|アルゴリズム [ファイル]|メッセージ要約を表示"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1120,55 +1120,55 @@ msgstr ""
 "オプション:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "ASCII形式の包装を作成"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|名前|「名前」用に暗号化"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "署名や復号にこのユーザーid\n"
 "を使用"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|圧縮レベルをNに設定\n"
 "(0は非圧縮)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "正準テキスト・モードを使用"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "出力ファイルとして使用"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "冗長"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "無変更"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "上書き前に確認"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "厳密なOpenPGPの振舞を採用"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x互換のメッセージを生成"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 "(コマンドとオプション全部の一覧は、\n"
 "マニュアル・ページをご覧ください)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1197,15 @@ msgstr ""
 " --list-keys [名前]         鍵を表示\n"
 " --fingerprint [名前]       指紋を表示\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "バグを見つけたら <gnupg-bugs@gnu.org> までご報告ください。\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "使い方: gpg [オプション] [ファイル] (ヘルプは -h)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "署名、検査、暗号化や復号\n"
 "既定の操作は、入力データに依存\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,566 +1223,571 @@ msgstr ""
 "\n"
 "サポートしているアルゴリズム:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "公開鍵: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "暗号法: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "ハッシュ: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "使い方: gpg [オプション] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "対立するコマンド\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=記号が、グループ定義「%s」内に見つかりません\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: homedir 「%s」の安全でない所有者\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 構成ファイル「%s」の安全でない所有者\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 拡張「%s」の安全でない所有者\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: homedir 「%s」の安全でない許可\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 構成ファイル「%s」の安全でない許可\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 拡張「%s」の安全でない許可\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: homedir 「%s」の安全でない上位ディレクトリー所有者\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 構成ファイル「%s」の安全でない上位ディレクトリー所有者\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 拡張「%s」の安全でない上位ディレクトリー所有者\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: homedir 「%s」の安全でない上位ディレクトリー許可\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 構成ファイル「%s」の安全でない上位ディレクトリー許可\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 拡張「%s」の安全でない上位ディレクトリー許可\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知の構成項目「%s」\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "秘密鍵輪に対応する署名がありません\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "指定された選好鍵サーバーURLは無効です\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "秘密鍵と公開鍵の一覧の反転"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "秘密鍵輪に対応する署名がありません\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意: 昔、既定だったオプション・ファイル「%s」は、無視されます\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意: 既定のオプション・ファイル「%s」がありません\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "オプション・ファイル「%s」: %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "「%s」からオプションを読み出します\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意: 普通%sは使いません!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "安全でない許可のため、暗号法拡張「%s」をロードしません\n"
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "「%s」は、有効な文字集合ではありません\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "「%s」は、有効な文字集合ではありません\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "鍵サーバーのURLを解析不能\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効な鍵サーバー・オプションです\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "無効な鍵サーバー・オプションです\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効な読込みオプションです\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "無効な読込みオプションです\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効な書出しオプションです\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "無効な書出しオプションです\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効な一覧オプションです\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "無効な一覧オプションです\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "「%s」は、有効な文字集合ではありません\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "指定された選好鍵サーバーURLは無効です\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "「%s」は、有効な文字集合ではありません\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "「%s」は、有効な文字集合ではありません\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効な検証オプションです\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "無効な検証オプションです\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%sに設定不能\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効な検証オプションです\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: プログラムのコア・ファイルができることがあります!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %sは%sより優先\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%sは%sとともに使うことはできません!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%sは%sとともに使っても無意味です!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "このセッションでgpg-agentは無効です\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "「%s」へ秘密鍵スタブを書き込みます\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2モードでは分離署名かクリア署名だけしかできません\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2モードでは署名と暗号化を同時にできません\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2を指定したら、(パイプでなく) ファイルを指定せねばなりません。\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2モードのメッセージ暗号化では、IDEA暗号法が必要です\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "選択された暗号アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "選択された要約アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "選択された圧縮アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "選択された証明書要約アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-neededは正の値が必要です\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neededは1より大きな値が必要です\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無効なdefault-cert-level。0か1か2か3でなければなりません\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意: 単純なS2Kモード(0)の使用には強く反対します\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "無効な既定の選好\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "無効な個人用暗号法の選好\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "無効な個人用要約の選好\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "無効な個人用圧縮の選好\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%sは%sで機能しません\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "暗号アルゴリズム「%s」を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "要約アルゴリズム「%s」を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "圧縮アルゴリズム「%s」を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベースの初期化に失敗しました: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [ファイル名]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ファイル名]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "「%s」の対称暗号に失敗しました: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ファイル名]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [ファイル名]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [ファイル名]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ファイル名]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [ファイル名]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ファイル名]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ファイル名]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ファイル名]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key ユーザーid"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key ユーザーid"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ユーザーid [コマンド]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [ユーザーid] [鍵輪]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "鍵サーバーへの送信に失敗しました: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "鍵サーバーからの受信に失敗しました: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "鍵の書出しに失敗しました: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "鍵サーバーの検索に失敗しました: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "鍵サーバーの回復に失敗しました: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "包装除去に失敗しました: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "包装に失敗しました: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無効なハッシュ・アルゴリズム「%s」です\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[ファイル名]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "開始します。メッセージを打ってください ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "あたえられた証明書ポリシーURLは無効です\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "あたえられた署名ポリシーURLは無効です\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定された選好鍵サーバーURLは無効です\n"
 
@@ -1805,44 +1810,44 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公開副鍵%sにたいする秘密副鍵がありません - 無視\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副鍵%sを主鍵%sに代用します\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "鍵%s: 公開鍵のない秘密鍵です - とばします\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "やや静か"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "この鍵を鍵輪から削除します"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "日時の矛盾を警告だけにします"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|ファイル記述子|このファイル記述子に状態を\n"
 "書き込む"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "使い方: gpgv [オプション] [ファイル] (ヘルプは -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2370,7 +2375,7 @@ msgstr "
 msgid "no writable keyring found: %s\n"
 msgstr "書込み可能な鍵輪が見つかりません: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "「%s」への書込み\n"
@@ -2723,42 +2728,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "署名を制限するドメーンか、それのない場合はenterを入力してください。\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ユーザーID“%s”は、失効されています。"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "それでもこの鍵に署名したいですか? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  署名不能。\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ユーザーID“%s”は、満了です。"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ユーザーID“%s”は、自己署名されていません。"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ユーザーID“%s”は、自己署名されていません。"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "本当に署名しますか? (y/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2767,11 +2772,11 @@ msgstr ""
 "“%s”にたいする自己署名は、\n"
 "PGP 2.x形式の署名です。\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2780,11 +2785,11 @@ msgstr ""
 "“%s”にたいするあなたの今の署名\n"
 "は満了です。\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "新しい署名を発行し、期限切れ署名と交換したいですか? (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2793,53 +2798,53 @@ msgstr ""
 "“%s”にたいするあなたの今の署名\n"
 "は内部署名です。\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "書出し可能な署名に格上げしたいですか? (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”は鍵%sでもう内部署名してあります\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”は鍵%sでもう署名してあります\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "それでも再署名したいですか? (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "鍵%sで署名すべきものはありません\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "この鍵は満了です!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "この鍵は%sで満了します。\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "同時に署名も満了にしたいですか? (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2モードではPGP 2.x鍵でOpenPGP署名ができません。\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "この鍵はPGP 2.xで使用できなくなります。\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2848,32 +2853,32 @@ msgstr ""
 "署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
 "注意して検証しましたか? 答がわからなければ、“0”を入力してください。\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 答えません。%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 全然、検査していません。%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 一応、検査しました。%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) かなり注意して検査しました。%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "選択は? (詳細は '?' で): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2882,75 +2887,75 @@ msgstr ""
 "本当にこの鍵にあなたの鍵“%s”で署名してよいですか\n"
 "(%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "自己署名になるでしょう。\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 署名は、書出し不可に設定されません。\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 署名は、失効不可に設定されません。\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "署名は、書出し不可に設定されます。\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "署名は、失効不可に設定されます。\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "この鍵は全然、検査していません。\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "この鍵は一応、検査しました。\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "この鍵は、かなり注意して検査しました。\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "本当に署名しますか? (y/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "署名に失敗しました: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "この鍵は保護されていません。\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鍵の秘密部分が得られません。\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鍵の秘密部分が得られません。\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "鍵は保護されています。\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "この鍵は編集できません: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2958,11 +2963,11 @@ msgstr ""
 "この秘密鍵の新しいパスフレーズを入力してください。\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "パスフレーズをちゃんと繰り返していません。再入力してください"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2971,206 +2976,206 @@ msgstr ""
 "おそらくそれは＊ろくでもない＊考えです!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "本当に実行しますか? (y/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "鍵の署名を正しい場所に移動します\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "保存して終了"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "指紋を表示"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "鍵とユーザーIDの一覧"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "ユーザーID Nの選択"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "ユーザーID Nの選択"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "署名の失効"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "鍵へ内部的に署名"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "コツ: まず署名するユーザーIDを選択します\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "ユーザーIDの追加"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "フォトIDの追加"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "ユーザーIDの削除"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "スマートカードへ鍵の追加"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "スマートカードの鍵への移動"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "スマートカードの鍵への移動"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "副鍵の削除"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "失効鍵の追加"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "選択したユーザーIDの選好を本当に更新しますか? (y/N) "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3鍵の有効期限は変更できません\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ユーザーIDを主にする"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "秘密鍵と公開鍵の一覧の反転"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "選好の一覧 (エキスパート)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "選好の一覧 (冗長)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "選択したユーザーIDの選好を本当に更新しますか? (y/N) "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "選好鍵サーバーのURIを設定"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "選択したユーザーIDの選好を本当に更新しますか? (y/N) "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "パスフレーズの変更"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "所有者信用の変更"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "選択した全ユーザーIDを本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "ユーザーIDの失効"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "副鍵の失効"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "鍵の使用を許可する"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "鍵の使用を禁止する"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "フォトIDを表示"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "秘密鍵ブロック“%s”の読出しエラー: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "秘密鍵が使用できます。\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "この実行には秘密鍵がいります。\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "まず“toggle”コマンドを使ってください。\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3178,159 +3183,159 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "鍵は、失効されています。"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "本当に全ユーザーIDに署名しますか? (y/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "コツ: まず署名するユーザーIDを選択します\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知の署名クラスです"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%sモードでこのコマンドは禁止です。\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "ユーザーIDを少なくともひとつ選択してください。\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "最後のユーザーIDは削除できません!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "選択した全ユーザーIDを本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "このユーザーIDを本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "この主鍵を本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "鍵をきっかり1本選択してください。\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "「%s」が開けません: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "鍵輪「%s」の作成エラー: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "鍵を少なくとも1本選択してください。\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "選択した鍵を本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "この鍵を本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "選択した全ユーザーIDを本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "このユーザーIDを本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "この鍵を本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "選択した鍵を本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "この鍵を本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "利用者指定信用データベースの利用中、所有者信用は設定されないこともありま"
 "す。\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "選好の一覧を設定:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "選択したユーザーIDの選好を本当に更新しますか? (y/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "選好を本当に更新しますか? (y/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "変更を保存しますか? (y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "保存せずに終了しますか? (y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新に失敗しました: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "秘密の更新に失敗しました: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "鍵は無変更なので更新は不要です。\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "要約: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "機能: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "無修正鍵サーバー"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "選好鍵サーバー: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3338,71 +3343,71 @@ msgstr ""
 "オプション:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x形式ユーザーIDの選好が、ありません。\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "この鍵は、%s鍵%sによって失効されたようです"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "この鍵は、%s鍵%sによって失効されたようです"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(デリケート)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "作成: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "失効: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "満了: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "満了: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "利用法: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "信用: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "有効性: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "この鍵は使用禁止に設定されています"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "カード番号: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3410,17 +3415,17 @@ msgstr ""
 "プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
 "ということを念頭においてください。\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "失効"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "満了"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3428,7 +3433,7 @@ msgstr ""
 "警告: 主たるユーザーIDがありません。このコマンドは、別な\n"
 "              ユーザーIDが主になると仮定する場合があります。\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3437,75 +3442,75 @@ msgstr ""
 "警告: これはPGP2形式の鍵です。フォトIDの追加で、一部の版のPGPは、\n"
 "      この鍵を拒否するかもしれません。\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "それでも追加したいですか? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "この正しい署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "この無効な署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "この未知の署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "この自己署名を本当に削除しますか? (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d個の署名を削除しました。\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d個の署名を削除しました。\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "何も削除していません。\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "無効な包装です"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ユーザーID“%s”は、失効されています。"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ユーザーID“%s”は、失効されています。"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ユーザーID“%s”は、失効されています。"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ユーザーID“%s”は、もう失効されています\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ユーザーID“%s”は、もう失効されています\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3514,359 +3519,359 @@ msgstr ""
 "警告: これはPGP 2.x形式の鍵です。指名失効者の追加で、一部の版のPGPは、\n"
 "      この鍵を拒否するかもしれません。\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "指名失効者のユーザーIDを入力してください: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "指名失効者には、その鍵自体を任命できません\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "この鍵は失効者としてもう指名されています\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: ある鍵を指名失効者に設定すると、元に戻せません!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "秘密鍵の選択をといてください。\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "高々1個の副鍵を選択してください。\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "副鍵の有効期限を変更します。\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "主鍵の有効期限を変更します。\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3鍵の有効期限は変更できません\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "秘密鍵輪に対応する署名がありません\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "警告: 署名副鍵%sは、相互証明でありません\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "ユーザーIDをきっかりひとつ選択してください。\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ユーザーID“%s”のv3自己署名をとばします\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "選好鍵サーバーURLを入力してください: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当に交換したいですか? (y/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "本当に削除したいですか? (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "署名注釈: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "上書きしますか? (y/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d番のユーザーIDはありません\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d番のユーザーIDはありません\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番のユーザーIDはありません\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ユーザーID:“%s”\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%sで%s%s%sに署名されています\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (書出し不可)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "この署名は%sで満了です。\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "それでも本当に失効したいですか? (y/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "この署名にたいする失効証明書を作成しますか? (y/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "これらのユーザーIDに鍵%sで署名しました:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (失効不可)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "あなたの鍵%sで%sに失効されています\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "これらの署名を失効しようとしています:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "失効証明書を本当に作成しますか? (y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "秘密鍵がありません\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ユーザーID“%s”は、もう失効されています\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: ユーザーID署名が、%d秒未来です\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "ユーザーID“%s”は、もう失効されています\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "ユーザーID“%s”は、もう失効されています\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "選好「%s」の重複\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "多すぎる暗号法選好\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "多すぎる要約選好\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "多すぎる圧縮選好\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "選好文字列に無効な項目「%s」があります\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "直接署名を書き込みます\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "自己署名を書き込みます\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "鍵対応への署名を書き込みます\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "無効な鍵長。%uビットにします\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "鍵長を%uビットに丸めます\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "鍵%sに可能な操作: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "今、可能な操作: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 署名力の反転\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 暗号力の反転\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 認証力の反転\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 完了\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "ご希望の鍵の種類を選択してください:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSAとElgamal (既定)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (署名のみ)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (独自能力を設定)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (暗号化のみ)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (署名のみ)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (暗号化のみ)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (独自能力を設定)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA鍵対は1024ビットになります。\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "どの鍵長にしますか? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "要求された鍵長は%uビット\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%uビットに丸めます\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3882,7 +3887,7 @@ msgstr ""
 "      <n>m = 鍵は n か月間で満了\n"
 "      <n>y = 鍵は n 年間で満了\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3898,40 +3903,40 @@ msgstr ""
 "      <n>m = 署名は n か月間で満了\n"
 "      <n>y = 署名は n 年間で満了\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "鍵の有効期間は? (0)"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "署名の有効期間は? (0)"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "無効な値\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%sは無期限です\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%sは無期限です\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%sは%sで満了します\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "この署名は%sで満了です\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3939,11 +3944,11 @@ msgstr ""
 "このシステムでは、2038年以降の日付を表示できませんが、\n"
 "2106年までなら正しく取り扱えます。\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "これで正しいですか? (y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3959,44 +3964,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "本名: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "名前に無効な文字があります\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "名前を数字で始めてはいけません\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "名前は5文字以上でなければなりません\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "電子メール・アドレス: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "有効な電子メール・アドレスではありません\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "コメント: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "コメントに無効な文字があります\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "あなたは文字集合「%s」を使っています。\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4007,7 +4012,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
 
@@ -4022,23 +4027,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "まずエラーを修正してください\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4046,12 +4051,12 @@ msgstr ""
 "秘密鍵を保護するためにパスフレーズがいります。\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4063,7 +4068,7 @@ msgstr ""
 "の“--edit-key”オプションでいつでも変更できます。\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4074,50 +4079,50 @@ msgstr ""
 "とか、ディスクにアクセスするとかの他のことをすると、乱数生成子で\n"
 "乱雑さの大きないい乱数を生成しやすくなるので、お勧めいたします。\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "鍵の生成が取り消されました。\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "「%s」へ公開鍵を書き込みます\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "「%s」へ秘密鍵スタブを書き込みます\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "「%s」へ秘密鍵を書き込みます\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "書込み可能な公開鍵輪が見つかりません: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "書込み可能な秘密鍵輪が見つかりません: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "公開鍵輪「%s」の書込みエラー: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "秘密鍵輪「%s」の書込みエラー: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4126,42 +4131,42 @@ msgstr ""
 "この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
 "“--edit-key”コマンドを使って副鍵を生成してください。\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "鍵の生成に失敗しました: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "鍵は%lu秒未来にできました (時間旅行か時計の障害でしょう)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "鍵は%lu秒未来にできました (時間旅行か時計の障害でしょう)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意: v3鍵の副鍵の作成は、OpenPGPに適合しません\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "本当に作成しますか? (y/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "カードへの鍵の保管に失敗しました: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "バックアップ・ファイル「%s」が作成できません: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意: カード鍵のバックアップが「%s」へ保存されます\n"
@@ -4439,207 +4444,211 @@ msgstr "
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 鍵%sを%s経由で回復できません: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "変な長さの暗号化済みセッション鍵 (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 暗号化済みセッション鍵\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "未知の要約アルゴリズムで生成されたパスフレーズ %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "公開鍵は%sです\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "公開鍵による暗号化済みデータ: 正しいDEKです\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-ビット%s鍵, ID %s, 日付%sに暗号化されました\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s鍵, ID %sで暗号化されました\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公開鍵の復号に失敗しました: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu 個のパスフレーズで暗号化\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 個のパスフレーズで暗号化\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s暗号化済みデータを仮定\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA暗号法は利用不能なので、楽天的ですが%sで代用しようとしています\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "復号に成功\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: メッセージの完全性は保護されていません\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 暗号化されたメッセージは改竄されています!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "復号に失敗しました: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意: 送信者は“内緒にする”ように求めています\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "元のファイル名='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立失効。“gpg --import”を使って適用してください\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "“%s”からの正しい署名"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "署名の検証を省略\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "この多重署名は取り扱えません\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%sに施された署名\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s鍵%sを使用\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%sに%s鍵ID %sで施された署名\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "以下に鍵があります: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "“%s”からの 不正な 署名"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "“%s”からの期限切れの署名"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "“%s”からの正しい署名"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[不確定]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                別名“%s”"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "期限切れの署名 %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "この署名は%sで満了です\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s署名、要約アルゴリズム %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "バイナリー"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "テキストモード"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知の"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "署名を検査できません: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "分離署名でありません\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 多重署名の検出。最初のものだけ検査します。\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "クラス0x%02xの独立署名\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "古い形式 (PGP 2.x) の署名\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() の中に無効なルート・パケットを検出しました\n"
 
@@ -4772,16 +4781,16 @@ msgstr "
 msgid "directory `%s' created\n"
 msgstr "ディレクトリー「%s」ができました\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "公開鍵のアルゴリズム%dは、取り扱えません\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 潜在的に剣呑な対称暗号化セッション鍵です\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
@@ -5496,12 +5505,12 @@ msgid ""
 "unexpanded.\n"
 msgstr "警告: 選好鍵サーバーURLを%%拡張不能 (大きすぎ)。非拡張を使用。\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "作成された署名の検査に失敗しました: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s署名。署名者:“%s”\n"
@@ -5520,11 +5529,11 @@ msgstr "
 msgid "signing:"
 msgstr "署名:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2モードではPGP 2.x形式の鍵でクリア署名しかできません\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s暗号化を使用します\n"
-- 
cgit v1.2.3