About to do a release candidate

31 files changed, 25478 insertions, 23218 deletions

diff --git a/AUTHORS b/AUTHORS
index ef7a4b8fa..a7d544d2f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -46,7 +46,7 @@ Jedi Lin <[email protected]> Translations [zh-tw]
 Jouni Hiltunen <[email protected]> Translations [fi]
 Tommi Vainikainen <[email protected]> Translations [fi]
 
-Laurentiu Buzdugan <[email protected]> Translations [ro]
+Laurentiu Buzdugan <[email protected]> Translations [ro]
 
 Magda Procha'zkova'  <[email protected]> Translations [cs]
 
diff --git a/ChangeLog b/ChangeLog
index 93e31885a..23ac74da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-03  Werner Koch  <[email protected]>
+
+	Released 1.4.1rc1.
+
 2005-01-22  David Shaw  <[email protected]>
 
 	* configure.ac: Define FTPS flag if we're using curl, and FTPS is
diff --git a/configure.ac b/configure.ac
index 2b3644d15..0ebc33c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.9.3"
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.4.1-cvs, [email protected])
+AC_INIT(gnupg, 1.4.1rc1, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
diff --git a/doc/README.W32 b/doc/README.W32
index e4dbcea2a..18f745d9c 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -14,7 +14,7 @@ Installation directory:
 =======================
 
 The installation directory of GnuPG is stored in the Registry under
-the key HKEY_LCOAL_MACHINE\Software\GNU\GnuPG with the name "Install
+the key HKEY_LOCAL_MACHINE\Software\GNU\GnuPG with the name "Install
 Directory".  The installer does not change the PATH environment
 variable to include this directory.  You might want to do this
 manually.
diff --git a/po/ChangeLog b/po/ChangeLog
index 4bcfe3efe..7fcff5d85 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-03  Werner Koch  <[email protected]>
+
+	* zh_TW.po, ro.po: Updated.
+
 2004-12-10  Werner Koch  <[email protected]>
 
 	* sv.po: Take the update done for 1.2.6.
diff --git a/po/be.po b/po/be.po
index 47d0625a7..892ec4795 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -29,9 +29,9 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -67,8 +67,8 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -112,145 +112,148 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 msgid "error reading application data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 msgid "reading the key failed\n"
 msgstr ""
 
@@ -284,7 +287,7 @@ msgstr "нечаканыя даньні"
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
@@ -301,7 +304,7 @@ msgstr ""
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
@@ -314,21 +317,21 @@ msgstr ""
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
@@ -338,14 +341,14 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr ""
 
@@ -353,145 +356,145 @@ msgstr ""
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -499,129 +502,129 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -629,43 +632,43 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -675,14 +678,14 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr ""
@@ -863,31 +866,31 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -895,128 +898,128 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr ""
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1026,51 +1029,51 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1078,7 +1081,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1098,15 +1101,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1116,7 +1119,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1124,475 +1127,475 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr ""
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "запіс у stdout\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -1600,53 +1603,53 @@ msgstr ""
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2420
-#, c-format
-msgid "using secondary key %s instead of primary key %s\n"
-msgstr ""
+#: g10/getkey.c:2458
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1885,377 +1888,395 @@ msgstr "Даведка адсутнічае"
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "Ключ абаронены.\n"
+
+#: g10/import.c:1680
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
+#: g10/import.c:2238
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr ""
+
+#: g10/import.c:2246
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr ""
+
+#: g10/import.c:2248
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr ""
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2271,51 +2292,51 @@ msgstr ""
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2323,225 +2344,234 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "сакрэтны ключ недаступны"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2549,587 +2579,629 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
-msgstr ""
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
+msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
+#: g10/keyedit.c:1326
+msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "праверыць подпісы ключа"
+
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
+msgstr "падпісаць ключ толькі мясцова"
+
+#: g10/keyedit.c:1335
+msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
-msgstr ""
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr ""
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
-msgstr ""
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
+msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
+#: g10/keyedit.c:1350
+msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
+#: g10/keyedit.c:1351
+msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr ""
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
+#: g10/keyedit.c:1357
+msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
+#: g10/keyedit.c:1360
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
+#: g10/keyedit.c:1365
+msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1366
 #, fuzzy
-msgid "revoke a user ID"
+msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr ""
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
+msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1331
-msgid "enable a key"
-msgstr ""
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1372
+msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1759
-msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr ""
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1760
-msgid "Do you really want to revoke this key? (y/N) "
+#: g10/keyedit.c:1822
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1824
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr ""
+
+#: g10/keyedit.c:2384
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
 msgstr ""
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
-msgstr ""
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3744
 #, c-format
-msgid "No secondary key with index %d\n"
+msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3159,144 +3231,144 @@ msgstr "за шмат пераваг для \"%c\"\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3306,7 +3378,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3316,39 +3388,47 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+msgid "Signature does not expire at all\n"
 msgstr ""
 
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
+msgstr "збой падпісаньня: %s\n"
+
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3358,44 +3438,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3403,38 +3483,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3442,7 +3522,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3450,105 +3530,105 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3557,65 +3637,67 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3667,127 +3749,127 @@ msgstr "%s: створаны зьвязак ключоў\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
@@ -3998,84 +4080,84 @@ msgstr ""
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -4123,16 +4205,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -4171,16 +4253,16 @@ msgstr ""
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4191,27 +4273,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "пароль занадта доўгі\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
@@ -4709,20 +4791,20 @@ msgstr ""
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Недапушчальны пароль. Калі ласка, паспрабуйце шчэ раз"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
@@ -5062,12 +5144,12 @@ msgstr ""
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 423dc6178..47ed98977 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4rc\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2003-12-05 19:15+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -49,9 +49,9 @@ msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -89,8 +89,8 @@ msgstr "no s'ha pogut llegir �%s�: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -146,146 +146,149 @@ msgstr ""
 "sistema tinga oportunitat de recollir m�s entropia. (Calen %d bytes "
 "m�s)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en la creaci� de la contrasenya: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "�%s� ja est� comprimida\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generaci� de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "error en la creaci� de la contrasenya: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -323,7 +326,7 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "la l�nia escapada amb gui� �s inv�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el car�cter radix64 %02x inv�lid s'ha om�s\n"
@@ -340,7 +343,7 @@ msgstr "fi de fitxer prematur (en CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
@@ -354,24 +357,24 @@ msgstr "f� de fitxer prematur (al final)\n"
 msgid "error in trailer line\n"
 msgstr "error en l'�ltima l�nia\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 "l'armadura �s inv�lida: la l�nia �s m�s llarga que %d car�cters\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "hi ha un car�cter �quoted printable� en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no est� disponible"
@@ -383,15 +386,15 @@ msgstr ""
 
 # Dest�s? ivb
 # Desat�s, s�. jm
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet aix� en mode desat�s\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Seleccioneu: "
 
@@ -399,17 +402,17 @@ msgstr "Seleccioneu: "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "No s'ha especificat cap ra�"
@@ -418,136 +421,136 @@ msgstr "No s'ha especificat cap ra�"
 # Probablement �s una clau, femen�. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "no processat"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau p�blica corresponent: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de �%s�: %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncies actualitzades"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital �s inv�lida\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital �s inv�lida\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generaci� de claus ha fallat: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -555,134 +558,134 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "La selecci� �s inv�lida.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la ra� de la revocaci�:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecci� �s desconegut\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja �s present\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "ix del men�"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # �pantalla� o �ajuda�?  ivb
 # �ajuda�, evidentment. jm
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau �s disponible en: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confian�a"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
@@ -690,47 +693,47 @@ msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introdu�u el nom d'usuari: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introdu�u el nom d'usuari: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introdu�u el nom d'usuari: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -740,14 +743,14 @@ msgstr "no s'ha pogut obrir �%s�\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau �%s�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n"
@@ -952,32 +955,32 @@ msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AV�S: no s'ha pogut eliminar el directori temporal �%s�: %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no est� protegida - es descarta\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AV�S: la clau secreta %08lX no te una simple suma de comprovaci� SK\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "AV�S: no s'ha exportat res\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -985,130 +988,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "xifra nom�s amb xifratge sim�tric"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # �de les claus� o �de la clau�?  ivb
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # �dactilars� o �digitals�?  ivb
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell p�blic"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocaci�"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confian�a"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1118,52 +1121,52 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressi� N (0 no comprimeix)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "usa el mode de text can�nic"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Un dels dos �s en la llista d'opcions amb --help. Urgh. jm
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "detall"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1177,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1194,15 +1197,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1217,7 +1220,7 @@ msgstr ""
 # Precissament acabem de parlar d'�implementat a la llista del GNOME
 # i s'ha dit que �s erroni, igual que �suportat� :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1225,477 +1228,477 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Clau p�blica: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Dispersi�: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Compressi�: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "forma d'�s: gpg [opcions] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = en la definici� de grup �%s�\n"
 
 # Indi. ivb
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
 
 # Indi. ivb
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
 
 # Indi. ivb
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions �%s�: %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de �%s�\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no �s per a �s normal!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensi� de xifrat �%s� no s'ha carregat per tindre permissos "
 "insegurs\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no �s un joc de car�cters v�lid\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr ""
 "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanci� no v�lides\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanci� no v�lides\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "AV�S: el programa podria crear un fitxer core!\n"
 
 # FIXME: prefer�ncia? jm
 # Ho discut�rem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s t� prefer�ncia sobre %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no �s perm�s amb %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no t� sentit amb %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
 # clares -> en clar?  ivb
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "les prefer�ncies per defecte s�n inv�lides\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportaci� de la clau ha fallat: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1703,23 +1706,23 @@ msgstr ""
 "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i "
 "acabar amb el signe �=�\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
@@ -1729,55 +1732,55 @@ msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la mem�ria cau de claus p�bliques - desactivada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau inv�lida %08lX s'ha fet v�lida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau p�blica %08lX - es descarta\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usar� la clau secund�ria %08lX en lloc de la prim�ria %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau p�blica - es descarta\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "una mica m�s silenci�s"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "pren les claus d'aquest anell"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps nom�s un av�s"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informaci� d'estat en aquest FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'�s: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use �Usage�?
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2135,254 +2138,255 @@ msgstr "No hi ha ajuda disponible"
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Heu signat els seg�ents ID d'usuari:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada �%s�\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no �s v�lid\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "a�� pot ser causat per l'abs�ncia d'autosignatura\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'est� escrivint en �%s�\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau p�blica �%s�\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra c�pia\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: �%s� 1 ID d'usuari nou\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: �%s� %d ID d'usuari nous\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: �%s� 1 signatura nova\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: �%s� %d signatures noves\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: �%s� 1 subclau nova\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: �%s� %d subclaus noves\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: �%s� no ha estat modificada\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no v�lid - es descarta\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2392,23 +2396,23 @@ msgstr ""
 # O �rebutjara�? ivb
 # Per tots els canvis d'anglicisme �ignorat� -> �es descarta�,
 # �es rebutja� est� b�. jm
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "clau %08lX: el certificat de revocaci� �s inv�lid: %s: es rebutja\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocaci� �%s�\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2416,118 +2420,139 @@ msgstr ""
 "�%s�\n"
 "\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "clau %08lX: l'autosignatura no �s v�lida en l'id d'usuari �%s�\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau p�blica no �s suportat\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enlla� de subclau m�ltiple\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci�\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocaci� no v�lida\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocaci� m�ltiples\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la signatura �s inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocaci� �s en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocaci� �s inv�lid: %s - es descarta\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau �s en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura �s inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr ""
+"clau %08lX: la classe de signatura �s inesperada (0x%02x) - es descarta\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci� "
 "%08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no "
 "est� present.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci� �%s�\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "la clau p�blica no coincideix amb la clau secreta!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "es descarta: la clau secreta ja �s present\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "es descarta: la clau secreta ja �s present\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2543,51 +2568,51 @@ msgstr "s'ha creat l'anell �%s?\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revocaci�]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 signatura err�nia\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures err�nies\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura v�lida\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2599,55 +2624,55 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari �%s� est� revocat."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari �%s� ha caducat."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari �%s� no est� autosignat."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2656,11 +2681,11 @@ msgstr ""
 "La vostra signatura en �%s�\n"
 "�s una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2669,11 +2694,11 @@ msgstr ""
 "La vostra signatura actual en �%s�\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reempla�ar la caducada? (s/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2682,54 +2707,54 @@ msgstr ""
 "La vostra signatura en �%s�\n"
 "�s una signatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "�%s� ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "�%s� ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducar� el %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "A�� inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2739,34 +2764,34 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu qu� \n"
 "contestar, entreu �0�.\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 "Seleccioneu una opci� (introdu�u �?� per obtindre m�s "
 "informaci�):"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2775,91 +2800,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "A�� ser� una autosignatura.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AV�S: la signatura no es marcar� com a inexportable.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AV�S: la signatura no es marcar� com a irrevocable.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcar� com a inexportable.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcar� com a irrevocable.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el proc�s de signatura: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no est� protegida.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "La clau est� protegida.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2867,11 +2901,11 @@ msgstr ""
 "Introdu�u la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2880,50 +2914,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer a��? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "s'est� posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcci�. jm
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "tria la clau secund�ria N"
+# Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
+# Yeah, els vaig corregir abans de que enviares la teua correcci�. jm
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "llista les signatures"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revoca signatures"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "signa la clau"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -2931,332 +2980,364 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot
 # el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en catal�. Potser li ho dir� a Werner. jm.
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "afegeix una clau secund�ria"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "esborra una clau secund�ria"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocaci�"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "esborra signatures"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "canvia la data de caducitat"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i p�bliques"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "llista les prefer�ncies (expert)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "llista les prefer�ncies (detallat)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "estableix la llista de prefer�ncies"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "prefer�ncies actualitzades"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "canvia la confian�a"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revoca signatures"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secund�ria"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "desactiva una clau"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "activa una clau"
 
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "desactiva una clau"
+
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes �%s�: %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "La clau secreta est� disponible.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer a��.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre �toggle� abans.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "La clau est� revocada."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura �s desconeguda"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'�ltim ID d'usuari!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Realment voleu revocar aquesta clau? "
+
+#: g10/keyedit.c:1822
+#, fuzzy
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de prefer�ncies"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les prefer�ncies? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualitzaci�: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
 # Potser %s haja d'anar darrere de �clau�.  ivb
 # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Aquesta clau pot ser revocada per la clau %s "
+
+# Potser %s haja d'anar darrere de �clau�.  ivb
+# �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3265,19 +3346,19 @@ msgstr ""
 "necess�riament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3287,7 +3368,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3296,49 +3377,49 @@ msgstr ""
 "AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. S�... (s/N/x) jm
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3348,168 +3429,180 @@ msgstr ""
 "pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introdu�u l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AV�S: no es pot desfer la nominaci� d'una clau com a revocador "
 "designat!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: �"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   signat per %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els seg�ents ID d'usuari:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari �%s� ja est� revocat\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "l'ID d'usuari �%s� ja est� revocat\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "l'ID d'usuari �%s� ja est� revocat\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3540,145 +3633,145 @@ msgstr "hi ha massa prefer�ncies �%c�\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "s'est� escrivint una signatura directa\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "s'est� escrivint l'autosignatura\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "s'est� escrivint la signatura de comprovaci� de la clau\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau �s inv�lida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nom�s xifrar)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nom�s signar)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nom�s xifrar)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nom�s signar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grand�ria voleu? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grand�ria sol�licitada �s %u bits\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3694,7 +3787,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3710,31 +3803,41 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "el valor no �s v�lid\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s no caduca en absolut\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
+#: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Aquesta signatura caduca el %s\n"
+
 # Amb �it� es refereix a les dates?  ivb
 # Aix� vaig entendre jo. jm
-#: g10/keygen.c:1584
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3742,12 +3845,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractar� b� fins l'any 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�s correcte? (s/n)"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3764,44 +3867,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Hi ha un car�cter inv�lid en el camp *nom*\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot comen�ar amb un d�git\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si m�s no, 5 car�cters\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Adre�a electr�nica: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "No �s una adre�a v�lida\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un car�cter inv�lid en el camp *comentari*\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de car�cters `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3812,30 +3915,30 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n"
 
 # xX? ivb
 # Hmm... s�. jm
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3843,12 +3946,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3860,7 +3963,7 @@ msgstr ""
 "useu aquest programa amb l'opci� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3873,69 +3976,70 @@ msgstr ""
 "aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "La generaci� de claus ha estat cancel�lada.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'est� escrivint la clau p�blica a �%s�\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell p�blic escrivible: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 "s'ha produ�t un error mentre s'escrivia l'anell p�blic �%s�: %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 "s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus p�blica i secreta.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generaci� de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3944,7 +4048,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3952,40 +4056,40 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no �s conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear �%s�: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3994,65 +4098,67 @@ msgstr ""
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Pol�tica de signatura cr�tica: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Pol�tica de signatura: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "AV�S: s'hi han trobat dades de notaci� inv�lides\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Notaci� de signatura cr�tica: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Notaci� de signatura: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau prim�ria:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau prim�ria:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4108,132 +4214,132 @@ msgstr ""
 "AV�S: les opcions en �%s� encara no estan actives durant aquesta "
 "execuci�\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau �%s�: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau �%s�: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'est� sol�licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'est� sol�licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'est� cercant �%s� al servidor HKP %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "�\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'est� cercant �%s� al servidor HKP %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'est� cercant �%s� al servidor HKP %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
 # �del servidor�, �en el servidor�?  ivb
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # �del servidor�, �en el servidor�?  ivb
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no �s un ID v�lid\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'est� sol�licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'est� sol�licitant la clau %08lX de %s\n"
@@ -4453,64 +4559,64 @@ msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel inv�lid en proc_tree()\n"
 
 # bolcats de mem�ria?  ivb
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els bolcats de mem�ria: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dades de confian�a: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no �s implementat"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del "
 "destinatari\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el m�dul de xifratge IDEA no est� present\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "vegeu http://www.gnupg.org/why-not-idea.html per a m�s informaci�\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opci� �%s� est� desaconsellada.\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AV�S: %s �s una opci� desaconsellada.\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n"
@@ -4518,29 +4624,29 @@ msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n"
 # G�nere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "No comprimit"
 
 # G�nere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de �%s�\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat �s desconegut �%s�\n"
@@ -4591,18 +4697,18 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AV�S: la clau de sessi� pot estar xifrada sim�tricament de forma "
 "insegura\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
@@ -4642,11 +4748,11 @@ msgstr "no s'ha pogut connectar amb �%s�: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4662,7 +4768,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument �*�.  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4673,27 +4779,27 @@ msgstr ""
 "�%2$.*1$s�\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Introdu�u la contrasenya\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "la contrasenya �s massa llarga\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "la resposta de l'agent �s inv�lida\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "s'ha cancel�lat per l'usuari\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
@@ -5241,20 +5347,20 @@ msgstr "l'algoritme de protecci� %d%s no est� suportat\n"
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritme de protecci� %d%s no est� suportat\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "La contrasenya no �s v�lida; torneu a intentar-ho"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "AV�S: la clau �s feble; per favor, canvieu la contrasenya.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "s'est� generant la suma de comprovaci� desaconsellada de 16-bits per a "
@@ -5642,12 +5748,12 @@ msgstr ""
 "la base de dades de confian�a est� corrompuda; per favor, executeu "
 "�gpg --fix-trustdb�.\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no es poden tractar l�nies m�s llargues de %d car�cters\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la l�nia d'entrada �s superior a %d car�cters\n"
@@ -6157,6 +6263,33 @@ msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "tria la clau secund�ria N"
+
+#~ msgid "list signatures"
+#~ msgstr "llista les signatures"
+
+#~ msgid "sign the key"
+#~ msgstr "signa la clau"
+
+#~ msgid "add a secondary key"
+#~ msgstr "afegeix una clau secund�ria"
+
+#~ msgid "delete signatures"
+#~ msgstr "esborra signatures"
+
+#~ msgid "change the expire date"
+#~ msgstr "canvia la data de caducitat"
+
+#~ msgid "set preference list"
+#~ msgstr "estableix la llista de prefer�ncies"
+
+#~ msgid "updated preferences"
+#~ msgstr "prefer�ncies actualitzades"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
@@ -6260,9 +6393,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/cs.po b/po/cs.po
index ad420f43c..a7b4538c3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -27,9 +27,9 @@ msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -65,8 +65,8 @@ msgstr "nemohu ��st `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -120,149 +120,152 @@ msgstr ""
 "Nedostatek n�hodn�ch bajt�. Pros�m, pracujte s opera�n�m syst�mem, abyste\n"
 "mu umo�nili z�skat v�ce entropie (je pot�eba %d bajt�).\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "do trval�ho uzam�en� karty z�st�v� %d pokus� o zad�n� PINu administr�tora\n"
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 #, fuzzy
 msgid "|A|Admin PIN"
 msgstr "PIN administr�tora"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "PIN administr�tora"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� s�riov�ho ��sla: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�ten� kl��e se nezda�ilo\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr "PIN [podpis hotov: %lu]"
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, c-format
 msgid "error getting serial number: %s\n"
 msgstr "chyba p�i z�sk�n� s�riov�ho ��sla: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 msgid "reading the key failed\n"
 msgstr "�ten� kl��e se nezda�ilo\n"
 
@@ -295,7 +298,7 @@ msgstr "neo�ek�van� ASCII armor: "
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
@@ -312,7 +315,7 @@ msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
@@ -325,23 +328,23 @@ msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dov�n� - pravd�podobn� byl pou�it "
 "�patn� MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
@@ -351,14 +354,14 @@ msgstr "OpenPGp karta nen� dostupn�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
@@ -366,138 +369,138 @@ msgstr "V� v�b�r? "
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -508,116 +511,116 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -625,7 +628,7 @@ msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -634,41 +637,41 @@ msgstr ""
 "Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
 "'z': "
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -678,14 +681,14 @@ msgstr "nelze otev��t `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
@@ -874,30 +877,30 @@ msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -905,127 +908,127 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1035,55 +1038,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1091,7 +1094,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1109,17 +1112,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1129,7 +1132,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1137,79 +1140,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1217,21 +1220,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1239,7 +1242,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1247,366 +1250,366 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1614,23 +1617,23 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -1638,52 +1641,52 @@ msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 msgid "[User ID not found]"
 msgstr "[ID u�ivatele nenalezeno]"
 
 # c-format
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2420
-#, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+#: g10/getkey.c:2458
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m sekund�rn� kl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2024,382 +2027,403 @@ msgstr "Pomoc nen� k dispozici"
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identifik�tor� (user ID): %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importov�no: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             beze zm�n: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nov� id u�ivatel� (user ID): %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nov� podkl��e: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nov� podpisy: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nov� revokace kl���: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportov�no: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#: g10/import.c:547
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
 msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:730
+#: g10/import.c:731
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
+
+#: g10/import.c:1680
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "tajn� kl�� je na kart� ulo�en\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "tajn� kl�� je na kart� ulo�en\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2415,51 +2439,51 @@ msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis� neov��en�ch, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2471,17 +2495,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2491,38 +2515,38 @@ msgstr ""
 "Hloubka v�t�� ne� 1 umo��uje kl���m, kter� jste podepsal\n"
 "podepsat jin� kl��, kter� bude pro V�s d�v�ryhodn�.\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Pros�m vlo�te dom�nu, pro kterou je podpis omezen nebo stiskn�te enter pro "
 "podpis bez omezen� na dom�nu.\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2531,11 +2555,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2545,13 +2569,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2561,54 +2585,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2618,32 +2642,32 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro detailn�j�� informace stiskn�t� '?'):"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2652,66 +2676,75 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2719,11 +2752,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2731,355 +2764,399 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "vyberte sekund�rn� kl�� N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "vypsat seznam podpis�"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "podepsat kl��"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "smazat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "p�idat sekund�rn� kl��"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "smazat sekund�rn� kl��"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "smazat podpisy"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "zm�nit dobu platnosti"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "ozna�it u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vyps�n�m seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "nastavit seznam p�edvoleb"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "aktualizovat p�edvolby"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
+#: g10/keyedit.c:1360
+#, fuzzy
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL pro preferovan� server kl���"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revokovat podpisy"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "odvolat platnost id u�ivatele"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revokovat sekund�rn� kl��"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "nastavit kl�� jako neplatn� (disable)"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "nastavit kl�� jako neplatn� (disable)"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "uk�zat fotografick� ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�m� t��da podpisu"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1759
-msgid "Do you really want to revoke the selected keys? (y/N) "
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Opravdu chcete revokovat tento kl��? (a/N) "
+
+#: g10/keyedit.c:1822
+#, fuzzy
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1760
-msgid "Do you really want to revoke this key? (y/N) "
+#: g10/keyedit.c:1824
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento kl��? (a/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3087,17 +3164,17 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3105,7 +3182,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3114,45 +3191,45 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3161,155 +3238,167 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
@@ -3336,143 +3425,143 @@ msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r kl��� DSA bude dlouh� 1024 bit�.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou velikost kl��e si p�ejete? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3488,7 +3577,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3504,29 +3593,39 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Podpis je platn� pro? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "platnost %s neskon��\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "platnost %s neskon��\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "platnost %s skon�� %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Platnost podpisu skon�� %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3534,11 +3633,11 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3554,44 +3653,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3602,29 +3701,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3632,12 +3731,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3649,7 +3748,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3662,63 +3761,64 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3726,7 +3826,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3734,39 +3834,39 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr "RSA modulus nen� dlouh� %d\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr "ve�ejn� RSA exponent je p��li� dlouh� (v�ce ne� 32 bit�)\n"
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr "d�lka RSA prvo��sla nen� %d\n"
@@ -3775,64 +3875,66 @@ msgstr "d�lka RSA prvo��sla nen� %d\n"
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Kritick� podepisovac� politika: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Podepisovac� politika: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr "Kriticky preferovan� keyserver: "
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Kritick� podepisovac� notace: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, c-format
 msgid "expired: %s)"
 msgstr "platnost skon�ila: %s)"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
@@ -3884,123 +3986,123 @@ msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
@@ -4215,87 +4317,87 @@ msgstr "podpis star�ho typu (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nen� implementov�n"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "v�ce informac� naleznete v dokumentu http://www.gnupg.cz/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -4342,16 +4444,16 @@ msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -4390,16 +4492,16 @@ msgstr "nemohu se p�ipojit k `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunikaci s gpg-agentem\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4410,27 +4512,27 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "heslo je p��li� dlouh�\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakce od agenta\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
@@ -4951,20 +5053,20 @@ msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, zkuste to znovu"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROV�N�: Objeven slab� kl�� - zm��te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generuji _nevhodn�_ 16-ti bitov� kontroln� sou�et pro ochranu soukrom�ho "
@@ -5332,12 +5434,12 @@ msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nemohu pracovat s ��dky del��mi ne� %d znak�\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
@@ -5814,6 +5916,33 @@ msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "vyberte sekund�rn� kl�� N"
+
+#~ msgid "list signatures"
+#~ msgstr "vypsat seznam podpis�"
+
+#~ msgid "sign the key"
+#~ msgstr "podepsat kl��"
+
+#~ msgid "add a secondary key"
+#~ msgstr "p�idat sekund�rn� kl��"
+
+#~ msgid "delete signatures"
+#~ msgstr "smazat podpisy"
+
+#~ msgid "change the expire date"
+#~ msgstr "zm�nit dobu platnosti"
+
+#~ msgid "set preference list"
+#~ msgstr "nastavit seznam p�edvoleb"
+
+#~ msgid "updated preferences"
+#~ msgstr "aktualizovat p�edvolby"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key id u�ivatele"
 
@@ -5926,9 +6055,6 @@ msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #~ msgid "addcardkey"
 #~ msgstr "addcardkey"
 
diff --git a/po/da.po b/po/da.po
index 45c427d30..4388b7943 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -30,9 +30,9 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -68,8 +68,8 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
@@ -122,147 +122,150 @@ msgstr ""
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
@@ -297,7 +300,7 @@ msgstr "uforventet beskyttelse:"
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
@@ -314,7 +317,7 @@ msgstr "for tidlig eof (i CRC)\n"
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
@@ -328,21 +331,21 @@ msgstr "for tidlig eof (i trailer)\n"
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
@@ -352,14 +355,14 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -367,151 +370,151 @@ msgstr "Dit valg? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -519,132 +522,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -652,47 +655,47 @@ msgstr ""
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -702,14 +705,14 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -890,31 +893,31 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -922,132 +925,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1057,57 +1060,57 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1127,16 +1130,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1146,7 +1149,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1154,492 +1157,492 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1648,55 +1651,55 @@ msgstr "den givne politik-URL er ugyldig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1937,377 +1940,397 @@ msgstr "Ingen hj�lp tilg�ngelig"
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#: g10/import.c:1680
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
+#: g10/import.c:2238
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr ""
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
+
 #: g10/keydb.c:167
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2323,51 +2346,51 @@ msgstr ""
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2375,852 +2398,906 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "hemmelig n�gle ikke tilg�ngelig"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "vis signaturer"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "sign�r n�glen"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+msgid "sign selected user IDs with a trust signature"
+msgstr ""
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "tilf�j sekund�r n�gle"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "slet signaturer"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "�ndr udl�bsdatoen"
+#: g10/keyedit.c:1351
+msgid "change the expiration date for the key or selected subkeys"
+msgstr ""
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1357
 #, fuzzy
-msgid "set preference list"
-msgstr "vis pr�ferencer"
+msgid "set preference list for the selected user IDs"
+msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "updated preferences"
-msgstr "vis pr�ferencer"
-
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
-msgstr ""
+msgid "set preferred keyserver URL for the selected user IDs"
+msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr ""
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1366
 #, fuzzy
-msgid "revoke a user ID"
+msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "sl� n�gle fra"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "sl� n�gle fra"
+
+#: g10/keyedit.c:1372
+msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Vil du virkelig gerne g�re dette?"
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
 msgstr ""
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
-msgstr ""
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
+msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Ingen sekund�r n�gle med indeks %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3250,146 +3327,146 @@ msgstr "vis pr�ferencer"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3399,7 +3476,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3409,42 +3486,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1571
-#, fuzzy, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1578
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "N�glen udl�ber aldrig\n"
+
+#: g10/keygen.c:1583
 #, fuzzy, c-format
-msgid "%s expires at %s\n"
+msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3454,44 +3541,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3502,28 +3589,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3531,12 +3618,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3544,7 +3631,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3552,106 +3639,106 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3660,71 +3747,73 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3776,128 +3865,128 @@ msgstr ""
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
@@ -4111,86 +4200,86 @@ msgstr "gammeldags (PGP 2.x) signatur\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "uimplementeret cifferalgoritme"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -4238,16 +4327,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -4286,16 +4375,16 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4303,29 +4392,29 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
@@ -4851,21 +4940,21 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 msgid "protection digest %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "ugyldig kodes�tning"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
@@ -5206,12 +5295,12 @@ msgstr ""
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5687,6 +5776,32 @@ msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
+#~ msgid "list signatures"
+#~ msgstr "vis signaturer"
+
+#~ msgid "sign the key"
+#~ msgstr "sign�r n�glen"
+
+#~ msgid "add a secondary key"
+#~ msgstr "tilf�j sekund�r n�gle"
+
+#~ msgid "delete signatures"
+#~ msgstr "slet signaturer"
+
+#~ msgid "change the expire date"
+#~ msgstr "�ndr udl�bsdatoen"
+
+#, fuzzy
+#~ msgid "set preference list"
+#~ msgstr "vis pr�ferencer"
+
+#, fuzzy
+#~ msgid "updated preferences"
+#~ msgstr "vis pr�ferencer"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Ingen sekund�r n�gle med indeks %d\n"
+
 #, fuzzy
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--sign-key bruger-id"
@@ -5786,9 +5901,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgid "deluid"
 #~ msgstr "sletbid"
 
-#~ msgid "addkey"
-#~ msgstr "tilf�j n�gle"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "tilf�j n�gle"
diff --git a/po/de.po b/po/de.po
index 6f4a2f3fa..d49b1269a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
-"PO-Revision-Date: 2004-12-16 10:54+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
+"PO-Revision-Date: 2004-12-27 18:16+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: cipher/primegen.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
+msgstr "Eine Primzahl mit pbits=%u und qbits=%u kann nicht erzeugt werden\n"
 
 #: cipher/primegen.c:311
 #, c-format
@@ -29,9 +29,9 @@ msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -68,8 +68,8 @@ msgstr "'%s' ist unlesbar: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -125,146 +125,149 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/app-openpgp.c:539
-#, fuzzy, c-format
+#: g10/app-openpgp.c:547
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
+msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:552
-#, fuzzy, c-format
+#: g10/app-openpgp.c:560
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
+msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
@@ -299,7 +302,7 @@ msgstr "Unerwartete ASCII-H�lle:"
 msgid "invalid dash escaped line: "
 msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
@@ -316,7 +319,7 @@ msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
@@ -330,23 +333,23 @@ msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-H�lle gefunden - m�glicherweise\n"
 " war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Geheimer Schl�ssel ist nicht vorhanden"
@@ -356,14 +359,14 @@ msgstr "Geheimer Schl�ssel ist nicht vorhanden"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
@@ -371,150 +374,150 @@ msgstr "Ihre Auswahl? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "nicht bearbeitet"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "ge�nderte Voreinstellungen"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 msgid "CA fingerprint: "
 msgstr "CA Fingerabdruck: "
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -522,132 +525,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Grund f�r den Widerruf:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -655,47 +658,47 @@ msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -705,14 +708,14 @@ msgstr "'%s' kann nicht ge�ffnet werden\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
@@ -917,32 +920,32 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNUNG: Tempor�res Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
 # translated by wk
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "WARNUNG: Der geheime Schl�ssel %08lX hat keine einfache SK Pr�fsumme\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -950,128 +953,128 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1081,51 +1084,51 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1134,7 +1137,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1154,17 +1157,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1174,7 +1177,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1182,73 +1185,73 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis (%s) \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses f�r Home-Verzeichnis "
 "\"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1256,19 +1259,19 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses der "
 "Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses des Home-"
 "Verzeichnisses  \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1276,383 +1279,383 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses der Konfigurationsdatei "
 "\"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
 "geladen\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
 "verschl�sseln\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr���er als 0 sein\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr���er als 1 sein\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ung�ltiger \"default-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ung�ltiger \"min-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1660,23 +1663,23 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -1685,57 +1688,57 @@ msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %08lX, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Schl�ssel zum �ffentlichen Schl�ssel %08lX - �bergangen\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
 "�bersprungen\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "Schl�ssel aus diesem Schl�sselbund nehmen"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2084,397 +2087,419 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unver�ndert: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, fuzzy, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %08lX: HKP Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltiger Verschl�sselung %d - "
 "�bersprungen\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf-Beglaubigung entfernt\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr ""
+"Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2490,51 +2515,51 @@ msgstr "Schl�sselbund `%s' erstellt\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2548,17 +2573,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2568,38 +2593,38 @@ msgstr ""
 "Eine Tiefe gr���er 1 erlaubt dem zu unterschreibenden Schl�ssel\n"
 "Trust-Signatures f�r Sie zu machen.\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geben Sie bitte eine Domain ein, um die Unterschrift einzuschr�nken,\n"
 "oder nur die Eingabetaste f�r keine Domain\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2608,11 +2633,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2621,13 +2646,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
 "(J/n) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2636,44 +2661,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immmer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2681,11 +2706,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies w�rde den Schl�ssel f�r PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2695,33 +2720,33 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es fl�chtig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
 # translated by wk
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2730,14 +2755,14 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2745,76 +2770,85 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2822,11 +2856,11 @@ msgstr ""
 "Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2834,372 +2868,415 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "Zweitschl�ssel N ausw�hlen"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "Liste der Signaturen"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "Den Schl�ssel signieren"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "Einen Zweitschl�ssel hinzuf�gen"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "Signatur entfernen"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "�ndern des Verfallsdatums"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "Liste der Voreinstellungen einstellen"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "ge�nderte Voreinstellungen"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "Die Passphrase �ndern"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "Signaturen widerrufen"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "Schl�ssel abschalten"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "Schl�ssel abschalten"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
+
+#: g10/keyedit.c:1822
+#, fuzzy
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3207,20 +3284,20 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
 # translated by wk
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3228,7 +3305,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als prim�r markiert.  Dieses Kommando kann\n"
 "dazu f�hren, da� eine andere User-ID as prim�r angesehen wird.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3238,45 +3315,45 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie k�nnen einem PGP2-artigen Schl���sel keine Foto-ID hinzuf�gen.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3286,37 +3363,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie k�nnen einem PGP2-artigen Schl���sel keine vorgesehenen Widerrufer "
 "hinzuf�gen.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schl�ssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schl�ssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht r�ckgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3324,129 +3401,141 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Kein Zweitschl�ssel mit Index %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "User-ID \"%s\" ist bereits widerrufen\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "User-ID \"%s\" ist bereits widerrufen\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3475,147 +3564,147 @@ msgstr "zu viele Komprimierungsvoreinstellungen\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "Daten verschl�sseln"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 #, fuzzy
 msgid "Authenticate"
 msgstr "uneingeschr�nkt"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 #, fuzzy
 msgid "Current allowed actions: "
 msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3631,7 +3720,7 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3647,29 +3736,39 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s verf�llt nie.\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s verf�llt nie.\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s verf�llt am %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Diese Unterschrift verf�llt am %s.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3677,12 +3776,12 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3699,44 +3798,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3747,27 +3846,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3775,12 +3874,12 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3793,7 +3892,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3804,64 +3903,65 @@ msgstr ""
 "unterst�tzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Bitte beachten Sie, da� dieser Schl�ssel nicht zum Verschl�sseln benutzt\n"
 "werden kann.  Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3869,7 +3969,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3877,40 +3977,40 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3919,65 +4019,67 @@ msgstr ""
 msgid "never     "
 msgstr "niemals   "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Krititische Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Krititische Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [verf�llt: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4030,131 +4132,131 @@ msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind w�hrend dieses Laufes noch nicht wirksam\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
@@ -4369,86 +4471,86 @@ msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "Verschl�sselungsverfahren ist nicht implementiert"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschl�sselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "F�r weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mi�billigte Option \"%s\".\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mi�billigte Option.\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "nicht komprimiert"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
@@ -4497,18 +4599,18 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: M�glicherweise unsicherer symmetrisch verschl�sselter "
 "Sitzungsschl�ssel\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -4547,17 +4649,17 @@ msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4568,27 +4670,27 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "Passphrase ist zu lang\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "Falsche Antwort des Agenten\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
@@ -5141,22 +5243,22 @@ msgstr "Schutzverfahren %d%s wird nicht unterst�tzt\n"
 msgid "protection digest %d is not supported\n"
 msgstr "Hashschutzverfahren %d wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Ung�ltige Passphrase; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte Passphrase nochmals wechseln.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Die mi�billigte 16-bit Pr�fsumme wird zum Schutz des geheimen Schl�ssels "
@@ -5544,12 +5646,12 @@ msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
@@ -6037,6 +6139,33 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "Zweitschl�ssel N ausw�hlen"
+
+#~ msgid "list signatures"
+#~ msgstr "Liste der Signaturen"
+
+#~ msgid "sign the key"
+#~ msgstr "Den Schl�ssel signieren"
+
+#~ msgid "add a secondary key"
+#~ msgstr "Einen Zweitschl�ssel hinzuf�gen"
+
+#~ msgid "delete signatures"
+#~ msgstr "Signatur entfernen"
+
+#~ msgid "change the expire date"
+#~ msgstr "�ndern des Verfallsdatums"
+
+#~ msgid "set preference list"
+#~ msgstr "Liste der Voreinstellungen einstellen"
+
+#~ msgid "updated preferences"
+#~ msgstr "ge�nderte Voreinstellungen"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Kein Zweitschl�ssel mit Index %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key User-ID"
 
@@ -6139,9 +6268,6 @@ msgstr ""
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/el.po b/po/el.po
index d3afd82a2..17f230f59 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -28,9 +28,9 @@ msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -68,8 +68,8 @@ msgstr "�������� ��������� ��� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -123,146 +123,149 @@ msgstr ""
 "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
 "����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "�������� block �������� �������: %s\n"
@@ -297,7 +300,7 @@ msgstr "�� ����������� ��������:"
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
@@ -314,7 +317,7 @@ msgstr "������ ����� ������� (����� CRC)\n"
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
@@ -328,23 +331,23 @@ msgstr "������ ����� ������� (��� �railer)\n"
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
@@ -354,15 +357,15 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
@@ -370,150 +373,150 @@ msgstr "� ������� ���; "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -521,132 +524,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -654,44 +657,44 @@ msgstr "�� ������ ������  (��������� \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -701,14 +704,14 @@ msgstr "�������� ��������� ��� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
@@ -908,31 +911,31 @@ msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -940,128 +943,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1071,51 +1074,51 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "���������"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1123,7 +1126,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1143,15 +1146,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1161,7 +1164,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1169,471 +1172,471 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1641,23 +1644,23 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -1666,53 +1669,53 @@ msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "������� ��� �������� ��� ���� �� ����������"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2050,388 +2053,409 @@ msgstr "��� ������� ��������� �������"
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "������������: ������� ������ ��� �����\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "������������: ������� ������ ��� �����\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2447,51 +2471,51 @@ msgstr "���������� `%s' �������������\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2504,53 +2528,53 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2559,11 +2583,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2572,12 +2596,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2586,43 +2610,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2630,11 +2654,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2644,32 +2668,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2678,21 +2702,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2700,14 +2724,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -2715,56 +2739,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2772,382 +2805,425 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "������� ������������� �������� N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "������� user ID N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "���������� ���������"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "�������� ���������"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "�������� ��� ��������"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "��������: �������� �� user ID ��� ��������\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "�������� ���� ������������� ��������"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "�������� ���������"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "������ ��� ����������� �����"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "������� ����������� ��������"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "����������� ��������"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "�������� ���������"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "������������� ��� ������"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "������������� ��� ������"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "������� ������ �� ��������� ���� �� ������; "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3155,19 +3231,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3175,7 +3251,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3184,45 +3260,45 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3232,38 +3308,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3271,129 +3347,141 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "��� ������� ���������� ������ �� ������ %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
@@ -3423,145 +3511,145 @@ msgstr "���� ������ `%c' �����������\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3577,7 +3665,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3593,29 +3681,39 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "�� %s ��� ����� ����\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "�������� ����� ���� %s.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3623,12 +3721,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3645,44 +3743,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3693,27 +3791,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3721,12 +3819,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3738,7 +3836,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3750,65 +3848,66 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "��������� ��� ���� �� ������ ��� ������ �� �������������� ��� "
 "�������������.\n"
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3816,7 +3915,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3824,42 +3923,42 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3868,65 +3967,67 @@ msgstr ""
 msgid "never     "
 msgstr "����     "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "�������������: �������� �� ������ �������� ���������\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [�����: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3979,130 +4080,130 @@ msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
@@ -4313,89 +4414,89 @@ msgstr "�������� ������ ���� (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�� ������������ ���������� ��������������"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "����� �� http://www.gnupg.org/why-not-idea.html ��� ������������ "
 "�����������\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "����������"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -4444,16 +4545,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -4492,16 +4593,16 @@ msgstr "�������� �������� ��� `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4513,27 +4614,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "�� ������ �������� ��� ��� agent\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
@@ -5074,20 +5175,20 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 msgid "protection digest %d is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "�� ������ ����� ������, ��������� ����"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�������������: ����������� ������� ������ - ������� �� ����� ������\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "���������� ��� �� ������������� 16-bit checksum ��� �� ��������� ���\n"
@@ -5464,12 +5565,12 @@ msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
@@ -5948,6 +6049,33 @@ msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "������� ������������� �������� N"
+
+#~ msgid "list signatures"
+#~ msgstr "���������� ���������"
+
+#~ msgid "sign the key"
+#~ msgstr "�������� ��� ��������"
+
+#~ msgid "add a secondary key"
+#~ msgstr "�������� ���� ������������� ��������"
+
+#~ msgid "delete signatures"
+#~ msgstr "�������� ���������"
+
+#~ msgid "change the expire date"
+#~ msgstr "������ ��� ����������� �����"
+
+#~ msgid "set preference list"
+#~ msgstr "������� ����������� ��������"
+
+#~ msgid "updated preferences"
+#~ msgstr "����������� ��������"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "��� ������� ���������� ������ �� ������ %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
@@ -6051,9 +6179,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/eo.po b/po/eo.po
index 8553a80e9..c58447cf7 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -28,9 +28,9 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -67,8 +67,8 @@ msgstr "ne povas legi '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -120,146 +120,149 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
@@ -294,7 +297,7 @@ msgstr "neatendita kiraso:"
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
@@ -311,7 +314,7 @@ msgstr "tro frua dosierfino (en CRC)\n"
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
@@ -325,23 +328,23 @@ msgstr "tro frua dosierfino (en vosto)\n"
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
@@ -351,15 +354,15 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -367,150 +370,150 @@ msgstr "Via elekto? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -518,132 +521,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -651,47 +654,47 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -701,14 +704,14 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
@@ -893,31 +896,31 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -925,128 +928,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1056,51 +1059,51 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1108,7 +1111,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1128,15 +1131,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1146,7 +1149,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1154,466 +1157,466 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1622,24 +1625,24 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -1648,55 +1651,55 @@ msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2021,379 +2024,399 @@ msgstr "Nenia helpo disponata"
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
+#: g10/import.c:2238
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr ""
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "ignorita: sekreta �losilo jam �eestas\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "ignorita: sekreta �losilo jam �eestas\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2409,51 +2432,51 @@ msgstr "�losilaro '%s' kreita\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2466,54 +2489,54 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2524,7 +2547,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2533,7 +2556,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2544,12 +2567,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2560,7 +2583,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2569,53 +2592,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2624,31 +2647,31 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2657,89 +2680,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2747,11 +2779,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2759,398 +2791,438 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "elekti flankan �losilon N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "listigi subskribojn"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "subskribi la �losilon"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "aldoni flankan �losilon"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "al"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "forvi�i subskribojn"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "�an�i la daton de eksvalidi�o"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "agordi liston de preferoj"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "aktualigitaj preferoj"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revoki subskribojn"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1366
 #, fuzzy
-msgid "revoke a user ID"
+msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "mal�alti �losilon"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "mal�alti �losilon"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "�u vi vere volas revoki �i tiun �losilon? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
 msgstr ""
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3159,46 +3231,46 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3208,164 +3280,176 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Mankas flanka �losilo kun indekso %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3395,146 +3479,146 @@ msgstr "tro da '%c'-preferoj\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3550,7 +3634,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3566,29 +3650,39 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s neniam eksvalidi�os\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3596,12 +3690,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3617,44 +3711,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3665,27 +3759,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3693,12 +3787,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3710,7 +3804,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3722,63 +3816,64 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3786,7 +3881,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3794,40 +3889,40 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3836,71 +3931,73 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3952,130 +4049,130 @@ msgstr "%s: �losilaro kreita\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
@@ -4288,87 +4385,87 @@ msgstr "malnovstila subskribo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita �ifrad-metodo"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -4416,16 +4513,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -4464,16 +4561,16 @@ msgstr "ne povas konekti�i al '%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4484,27 +4581,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "nevalida respondo de agento\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
@@ -5039,21 +5136,21 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 msgid "protection digest %d is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Nevalida pasfrazo; bonvolu provi denove"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
@@ -5412,12 +5509,12 @@ msgstr "%s: malsukcesis aldoni registron: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
@@ -5895,6 +5992,33 @@ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "elekti flankan �losilon N"
+
+#~ msgid "list signatures"
+#~ msgstr "listigi subskribojn"
+
+#~ msgid "sign the key"
+#~ msgstr "subskribi la �losilon"
+
+#~ msgid "add a secondary key"
+#~ msgstr "aldoni flankan �losilon"
+
+#~ msgid "delete signatures"
+#~ msgstr "forvi�i subskribojn"
+
+#~ msgid "change the expire date"
+#~ msgstr "�an�i la daton de eksvalidi�o"
+
+#~ msgid "set preference list"
+#~ msgstr "agordi liston de preferoj"
+
+#~ msgid "updated preferences"
+#~ msgstr "aktualigitaj preferoj"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Mankas flanka �losilo kun indekso %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key uzantidentigilo"
 
@@ -5998,9 +6122,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "delphoto"
 #~ msgstr "forfoto"
 
-#~ msgid "addkey"
-#~ msgstr "al"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "al"
diff --git a/po/es.po b/po/es.po
index 5bf66edcd..31c1e5a3c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-10-12 19:27+0200\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -32,9 +32,9 @@ msgstr "no se puede generar un primo con menos de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -76,8 +76,8 @@ msgstr "no se puede leer `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -133,146 +133,149 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nuevo par de claves"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
@@ -307,7 +310,7 @@ msgstr "armadura inesperada"
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracteres inv�lidos radix64 %02x omitidos\n"
@@ -324,7 +327,7 @@ msgstr "Fin de suma de comprobaci�n prematuro\n"
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
@@ -338,23 +341,23 @@ msgstr "fin de fichero prematuro (en el cierre)\n"
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "clave secreta no disponible"
@@ -364,15 +367,15 @@ msgstr "clave secreta no disponible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
@@ -380,152 +383,152 @@ msgstr "Su elecci�n: "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "habcla"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "habcla"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "no procesado"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: huella dactilar no v�lida\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Huella dactilar:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: huella dactilar no v�lida\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -533,132 +536,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Clave disponible en: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia fecha de caducidad"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia valores de confianza"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nuevo par de claves"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -666,47 +669,47 @@ msgstr "Orden inv�lida (pruebe \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita frase contrase�a: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -716,14 +719,14 @@ msgstr "no se puede abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
@@ -919,28 +922,28 @@ msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %08lX: no protegida - omitida\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVISO: la clave secreta %08lX no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -948,7 +951,7 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -956,128 +959,128 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1087,47 +1090,47 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
@@ -1135,7 +1138,7 @@ msgstr ""
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1143,7 +1146,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1163,15 +1166,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1181,7 +1184,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1189,448 +1192,448 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n \"%s\" por permisos inseguros\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado \"%s\" en modo %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen \"%s\" en modo %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n \"%s\" en modo %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1638,11 +1641,11 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1650,23 +1653,23 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
@@ -1675,36 +1678,36 @@ msgstr "URL de pol�tica inv�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %08lX inv�lida hecha mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la clave p�blica %08lX -ignorada\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "tomar las claves de este anillo"
 
@@ -1712,19 +1715,19 @@ msgstr "tomar las claves de este anillo"
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relaci�n con el mensaje.
 # Ok.
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2057,385 +2060,406 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "firma %s de: \"%s\"\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %08lX: sin identificador de usuario\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %08lX: reparada la subclave HKP corrompida\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %08lX: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %08lX: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %08lX: no coincide con nuestra copia\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %08lX: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %08lX: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %08lX: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %08lX: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %08lX: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %08lX: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %08lX: \"%s\" sin cambios\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %08lX: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "clave %08lX: algoritmo de clave p�blica no disponible para el id \"%s\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave que unir\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %08lX: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %08lX: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %08lX: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %08lX: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %08lX: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %08lX: omitido ID de usuario '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %08lX: subclave omitida\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %08lX: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %08lX puede estar revocada: falta clave de revocaci�n %"
 "08lX.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %08lX: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %08lX: firma directa de clave a�adida\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "�la clave p�blica y la privada no se corresponden!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "omitido: clave secreta ya presente\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "omitido: clave secreta ya presente\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2451,51 +2475,51 @@ msgstr "anillo `%s' creado\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2508,53 +2532,53 @@ msgstr ""
 "comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o poco\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2563,11 +2587,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2576,11 +2600,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2589,43 +2613,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2633,11 +2657,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2647,32 +2671,32 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2681,91 +2705,100 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2773,11 +2806,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2785,372 +2818,415 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "selecciona clave secundaria N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "lista firmas"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revoca firmas"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "firma la clave"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "lid %lu: identificativo de usuario sin firma\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "a�ade un identificador de usuario"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "a�ade un ID fotogr�fico"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "borra un identificador de usuario"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "a�ade una clave secundaria"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "a�acla"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "a�ade una clave de revocaci�n"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "borra firmas"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"�Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "cambia fecha de caducidad"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "marca ID de usuario como primario"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "muestra preferencias (experto)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias (prolijo)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "establece preferencias"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "preferencias actualizadas"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"�Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revoca firmas"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "�Revocar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "revocar un identificador de usuario"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "deshabilita una clave"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "deshabilita una clave"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "mostrar ID fotogr�fico"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de firma desconocida"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "�De verdad quiere revocar esta clave? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "establece preferencias"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Esta clave puede ser revocada por la clave %s"
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por la clave %s"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (confidencial)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3158,19 +3234,19 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expira"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3178,7 +3254,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3187,45 +3263,45 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3234,163 +3310,175 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmada por %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3421,145 +3509,145 @@ msgstr "demasiadas `%c' preferencias\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "firma"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra datos"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3575,7 +3663,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3591,29 +3679,39 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s nunca caduca\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s nunca caduca\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "La firma caduca el %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3621,12 +3719,12 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3643,44 +3741,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3691,29 +3789,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
 "comentario\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3721,12 +3819,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3738,7 +3836,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3751,63 +3849,64 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
 "la orden \"--edit-key\" para crear una clave secundaria con este prop�sito.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3815,7 +3914,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3823,40 +3922,40 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: clave secreta %08lX caducada el %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3865,65 +3964,67 @@ msgstr ""
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Pol�tica de firmas cr�ticas: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Pol�tica de firmas: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Notaci�n de firmas cr�ticas: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "    Huella de clave ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3975,130 +4076,130 @@ msgstr "%s: anillo creado\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "descla"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %08lX a %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %08lX a %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error del servidor de claves"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error del servidor de claves"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "'%s' no es un identificador de clave v�lido\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando clave %08lX a %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando clave %08lX a %s\n"
@@ -4307,88 +4408,88 @@ msgstr "firma al viejo estilo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "actualizaci�n de base de datos de confianza fallida: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado no implementado"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "firma %s de: \"%s\"\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "por favor vea http://www.gnupg.org/why-not-idea.html para m�s informaci�n\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada.\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sin comprimir"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
@@ -4436,17 +4537,17 @@ msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
@@ -4485,16 +4586,16 @@ msgstr "no se puede conectar con `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4505,27 +4606,27 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %08lX, creada el %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "respuesta del agente inv�lida\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
@@ -5062,21 +5163,21 @@ msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
 msgid "protection digest %d is not supported\n"
 msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Frase contrase�a incorrecta; int�ntelo de nuevo."
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ... \n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATENCI�N: detectada clave d�bil - por favor cambie la frase contrase�a.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generando la suma de comprobaci�n de 16 bits (desaconsejada) para \n"
@@ -5444,12 +5545,12 @@ msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
@@ -5951,6 +6052,33 @@ msgstr "operaci�n imposible sin memoria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "selecciona clave secundaria N"
+
+#~ msgid "list signatures"
+#~ msgstr "lista firmas"
+
+#~ msgid "sign the key"
+#~ msgstr "firma la clave"
+
+#~ msgid "add a secondary key"
+#~ msgstr "a�ade una clave secundaria"
+
+#~ msgid "delete signatures"
+#~ msgstr "borra firmas"
+
+#~ msgid "change the expire date"
+#~ msgstr "cambia fecha de caducidad"
+
+#~ msgid "set preference list"
+#~ msgstr "establece preferencias"
+
+#~ msgid "updated preferences"
+#~ msgstr "preferencias actualizadas"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key id-usuario"
 
@@ -6054,9 +6182,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "delphoto"
 #~ msgstr "borfoto"
 
-#~ msgid "addkey"
-#~ msgstr "a�acla"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "a�acla"
@@ -7006,9 +7131,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ "lid %lu: no se ha encontrado identificativo de usuario\n"
 #~ "en el bloque de clave\n"
 
-#~ msgid "lid %lu: user id without signature\n"
-#~ msgstr "lid %lu: identificativo de usuario sin firma\n"
-
 #~ msgid "lid %lu: self-signature in hintlist\n"
 #~ msgstr "lid %lu: autofirma en lista de b�squeda\n"
 
diff --git a/po/et.po b/po/et.po
index c37d64999..62a31bc18 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -28,9 +28,9 @@ msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -66,8 +66,8 @@ msgstr "`%s' ei �nnestu lugeda: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -121,146 +121,149 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
@@ -295,7 +298,7 @@ msgstr "ootamatu pakend:"
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
@@ -312,7 +315,7 @@ msgstr "enneaegne failil�pp (poolik CRC)\n"
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
@@ -326,22 +329,22 @@ msgstr "enneaegne failil�pp (l�petaval real)\n"
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
@@ -351,15 +354,15 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Teie valik? "
 
@@ -367,150 +370,150 @@ msgstr "Teie valik? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -518,132 +521,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -651,44 +654,44 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Korrake parooli: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -698,14 +701,14 @@ msgstr "`%s' ei �nnestu avada\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
@@ -897,31 +900,31 @@ msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -929,128 +932,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1060,51 +1063,51 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1112,7 +1115,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1132,15 +1135,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1150,7 +1153,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1158,458 +1161,458 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1617,23 +1620,23 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1642,54 +1645,54 @@ msgstr "antud allkirja poliisi URL on vigane\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "v�ta v�tmed sellest v�tmehoidlast"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2015,382 +2018,403 @@ msgstr "Abiinfo puudub"
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2406,51 +2430,51 @@ msgstr "v�tmehoidla `%s' on loodud\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2463,53 +2487,53 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2518,11 +2542,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2531,11 +2555,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2544,54 +2568,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2601,32 +2625,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2635,91 +2659,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2727,11 +2760,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2739,371 +2772,412 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "vali sekundaarne v�ti N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "n�ita allkirju"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "allkirjasta v�ti"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "lisa sekundaarne v�ti"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "kustuta allkirjad"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "muuda aegumise kuup�eva"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "sea eelistuste nimekiri"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "uuendatud eelistused"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "t�hista allkirjad"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "blokeeri v�ti"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "blokeeri v�ti"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Kas te t�esti soovite seda v�tit t�histada? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3111,19 +3185,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3131,7 +3205,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3140,45 +3214,45 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3187,160 +3261,172 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Sekundaarne v�ti numbriga %d puudub\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
@@ -3370,145 +3456,145 @@ msgstr "liiga palju `%c' eelistusi\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3524,7 +3610,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3540,29 +3626,39 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s ei aegu kunagi\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Allkiri aegub %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3570,12 +3666,12 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3591,44 +3687,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3639,27 +3735,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3667,12 +3763,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3684,7 +3780,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3696,109 +3792,110 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Pidage silmas, et seda v�tit ei saa kasutada kr�ptimiseks. \n"
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3807,65 +3904,67 @@ msgstr ""
 msgid "never     "
 msgstr "mitte kunagi"
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Kriitiline allkirja poliitika: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3917,130 +4016,130 @@ msgstr "%s: v�tmehoidla on loodud\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
@@ -4248,86 +4347,86 @@ msgstr "vana stiili (PGP 2.x) allkiri\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata �ifri algoritm"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -4375,18 +4474,18 @@ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -4425,16 +4524,16 @@ msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4445,27 +4544,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "liiga pikk parool\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "vigane vastus agendilt\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
@@ -5001,20 +5100,20 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 msgid "protection digest %d is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Vigane parool; palun proovige uuesti"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
@@ -5373,12 +5472,12 @@ msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
@@ -5854,6 +5953,33 @@ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "vali sekundaarne v�ti N"
+
+#~ msgid "list signatures"
+#~ msgstr "n�ita allkirju"
+
+#~ msgid "sign the key"
+#~ msgstr "allkirjasta v�ti"
+
+#~ msgid "add a secondary key"
+#~ msgstr "lisa sekundaarne v�ti"
+
+#~ msgid "delete signatures"
+#~ msgstr "kustuta allkirjad"
+
+#~ msgid "change the expire date"
+#~ msgstr "muuda aegumise kuup�eva"
+
+#~ msgid "set preference list"
+#~ msgstr "sea eelistuste nimekiri"
+
+#~ msgid "updated preferences"
+#~ msgstr "uuendatud eelistused"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Sekundaarne v�ti numbriga %d puudub\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key kasutaja-id"
 
@@ -5957,9 +6083,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/fi.po b/po/fi.po
index 711a61b30..c1d6a48e4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -44,9 +44,9 @@ msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 msgid "no entropy gathering module detected\n"
 msgstr "entropian keräysmoduulia ei havaittu\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -83,8 +83,8 @@ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -139,146 +139,149 @@ msgstr ""
 "antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n"
 "(Vielä tarvitaan %d tavua)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -313,7 +316,7 @@ msgstr "odottamaton ascii-koodaus:"
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
@@ -330,7 +333,7 @@ msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
@@ -344,16 +347,16 @@ msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -361,7 +364,7 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
@@ -371,15 +374,15 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Valintasi? "
 
@@ -387,150 +390,150 @@ msgstr "Valintasi? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -538,132 +541,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -671,44 +674,44 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Toista salasana: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -718,14 +721,14 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -915,33 +918,33 @@ msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
 "tarkistussummaa\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -949,128 +952,128 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1080,51 +1083,51 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1133,7 +1136,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1152,16 +1155,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1171,7 +1174,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1179,459 +1182,459 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1639,23 +1642,23 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -1664,56 +1667,56 @@ msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "ota avaimet tästä avainrenkaasta"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2047,385 +2050,406 @@ msgstr "Ei ohjeita saatavilla"
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "ohitetaan: salainen avain on jo paikalla\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "ohitetaan: salainen avain on jo paikalla\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2441,52 +2465,52 @@ msgstr "avainrengas \"%s\" luotu\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2499,53 +2523,53 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2554,13 +2578,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2569,11 +2593,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2582,55 +2606,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2639,32 +2663,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2673,91 +2697,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2765,11 +2798,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2777,371 +2810,412 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "valitse toissijainen avain N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "näytä allekirjoitukset"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "allekirjoita avain"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "lisää toissijainen avain"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "poista allekirjoitus"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "muuta voimassoloaikaa"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "näytä valinnat"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "päivitä valinnat"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "mitätöi allekirjoitus"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "poista avain käytöstä"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "poista avain käytöstä"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3149,19 +3223,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3169,7 +3243,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3178,45 +3252,45 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3226,162 +3300,174 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Indeksillä %d ei löydy toissijaista avainta\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3413,145 +3499,145 @@ msgstr "liian monta \"%c\" valintaa\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3567,7 +3653,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3583,29 +3669,39 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s ei vanhene koskaan\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Allekirjoitus vanhenee %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3613,12 +3709,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3636,44 +3732,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3684,27 +3780,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3712,12 +3808,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3729,7 +3825,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3741,63 +3837,64 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3805,7 +3902,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3813,40 +3910,40 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3855,65 +3952,67 @@ msgstr ""
 msgid "never     "
 msgstr "ei koskaan"
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Kriittinen allekirjoituskäytäntö: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Allekirjoituskäytäntö: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [vanhenee: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3967,130 +4066,130 @@ msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
@@ -4304,87 +4403,87 @@ msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "lue lisätietoja osoitteesta http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -4434,16 +4533,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -4482,16 +4581,16 @@ msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4502,27 +4601,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "salasana on liian pitkä\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
@@ -5065,20 +5164,20 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 msgid "protection digest %d is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Salasana ei kelpaa; yritä uudestaan"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROITUS: Havaittiin heikko avain -  vaihda salasanaa uudestaan.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "luodaan paheksuttava 16-bittinen tarkistussumma salaisen avaimen suojaksi\n"
@@ -5452,12 +5551,12 @@ msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
@@ -5934,6 +6033,33 @@ msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "valitse toissijainen avain N"
+
+#~ msgid "list signatures"
+#~ msgstr "näytä allekirjoitukset"
+
+#~ msgid "sign the key"
+#~ msgstr "allekirjoita avain"
+
+#~ msgid "add a secondary key"
+#~ msgstr "lisää toissijainen avain"
+
+#~ msgid "delete signatures"
+#~ msgstr "poista allekirjoitus"
+
+#~ msgid "change the expire date"
+#~ msgstr "muuta voimassoloaikaa"
+
+#~ msgid "set preference list"
+#~ msgstr "näytä valinnat"
+
+#~ msgid "updated preferences"
+#~ msgstr "päivitä valinnat"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Indeksillä %d ei löydy toissijaista avainta\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrlsign-key käyttäjätunnus"
 
@@ -6037,9 +6163,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/fr.po b/po/fr.po
index 5ddea37bf..550d5eff7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.93-cvs\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-11-08 01:13+0100\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -33,9 +33,9 @@ msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -73,8 +73,8 @@ msgstr "impossible de lire `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -130,152 +130,155 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d tentatives de PIN admin restent jusqu'� ce que la carte\n"
 "soit irr�m�diablement bloqu�e\n"
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 #, fuzzy
 msgid "|A|Admin PIN"
 msgstr "PIN d'administration"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "PIN d'administration"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant la lecture du num�ro de s�rie: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "la lecture de la cl� a �chou�\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr "PIN [sigs faites: %lu]"
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erreur pendant la lecture du num�ro de s�rie: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 msgid "reading the key failed\n"
 msgstr "la lecture de la cl� a �chou�\n"
 
@@ -308,7 +311,7 @@ msgstr "armure inattendue: "
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
@@ -325,7 +328,7 @@ msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
@@ -338,23 +341,23 @@ msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
@@ -364,14 +367,14 @@ msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
@@ -379,142 +382,142 @@ msgstr "Votre choix ? "
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -525,118 +528,118 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -644,7 +647,7 @@ msgstr "Commande invalide  (essayez �help�)\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -654,39 +657,39 @@ msgstr ""
 "s�rie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "R�p�tez le mot de passe: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -696,14 +699,14 @@ msgstr "impossible d'ouvrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
@@ -904,32 +907,32 @@ msgstr ""
 "AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
 "%s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -937,127 +940,127 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1067,51 +1070,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1119,7 +1122,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1139,17 +1142,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1159,7 +1162,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1167,85 +1170,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1253,21 +1256,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1275,383 +1278,383 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "�criture d'un bout de cl� secr�te vers `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1659,23 +1662,23 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
@@ -1683,57 +1686,57 @@ msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2420
-#, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+#: g10/getkey.c:2458
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la cl� secondaire %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2073,390 +2076,411 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:547
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
 msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
+
+#: g10/import.c:1680
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2472,51 +2496,51 @@ msgstr "le porte-cl�s `%s` a �t� cr��\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2528,17 +2552,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2548,38 +2572,38 @@ msgstr ""
 "Une profondeur sup�rieure � 1 permet � la cl� que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Entrez un domaine pour restreindre cette signature, ou bien appuyez\n"
 "sur la touche entr�e pour aucun domaine.\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2588,11 +2612,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2601,13 +2625,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2616,43 +2640,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2660,11 +2684,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2674,32 +2698,32 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2708,80 +2732,89 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2790,358 +2823,406 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "s�lectionner la cl� secondaire N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "lister les signatures"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "signer la cl�"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Aide: S�lectionner les utilisateurs � signer\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "ajouter une cl� secondaire"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "aj.cl�"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "supprimer les signatures"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
+"s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "changer la date d'expiration"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "donner la liste de pr�f�rences"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "pr�f�rences mises � jour"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
+"s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
+#: g10/keyedit.c:1360
+#, fuzzy
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "indiquer l'URL du serveur de cl�s pr�f�r�"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "r�voquer les signatures"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "r�voquer un nom d'utilisateur"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "d�sactiver une cl�"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "activer une cl�"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "d�sactiver une cl�"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "montrer la photo d'identit�"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de signature inconnue"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1759
-msgid "Do you really want to revoke the selected keys? (y/N) "
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Voulez-vous vraiment r�voquer cette cl� ? (o/N) "
+
+#: g10/keyedit.c:1822
+#, fuzzy
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1760
-msgid "Do you really want to revoke this key? (y/N) "
+#: g10/keyedit.c:1824
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
+
+#: g10/keyedit.c:2384
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3149,17 +3230,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3168,7 +3249,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3178,46 +3259,46 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3227,165 +3308,177 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Pas de cl� secondaire avec l'index %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3415,145 +3508,145 @@ msgid "invalid item `%s' in preference string\n"
 msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3569,7 +3662,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3585,29 +3678,39 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s n'expire pas du tout\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s expire le %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "La signature expire le %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3615,11 +3718,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3635,44 +3738,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3683,28 +3786,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3712,12 +3815,12 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3729,7 +3832,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3741,67 +3844,68 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'un bout de cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Notez que cette cl� ne peut �tre utilis�e pour chiffrer. Vous pouvez\n"
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3809,7 +3913,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3817,40 +3921,40 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr "la longueur du modulo RSA n'est pas %d\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr "l'exposant public est trop �lev� (plus de 32 bits)\n"
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr "la longueur d'un nombre premier RSA n'est pas %d\n"
@@ -3859,64 +3963,66 @@ msgstr "la longueur d'un nombre premier RSA n'est pas %d\n"
 msgid "never     "
 msgstr "jamais    "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Politique de signature critique: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr "Serveur de cl�s critique favori: "
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Notation de signature critique: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, c-format
 msgid "expired: %s)"
 msgstr "expir�e: %s)"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 msgid "      Key fingerprint ="
 msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
@@ -3971,131 +4077,131 @@ msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
@@ -4308,87 +4414,87 @@ msgstr "signature d'un ancien style (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorithme de chiffrement non implant�"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -4436,18 +4542,18 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
@@ -4489,16 +4595,16 @@ msgstr "impossible de se connecter � `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�me de communication avec ssh-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4510,27 +4616,27 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez le mot de passe\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Entrez le mot de passe\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "mot de passe trop long\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "r�ponse de l'agent invalide\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
@@ -5066,20 +5172,20 @@ msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 msgid "protection digest %d is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Mot de passe invalide ; r�essayez"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore le mot de passe.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "g�n�ration de la somme de contr�le de 16 bits (d�pr�ci�e) pour prot�ger\n"
@@ -5465,12 +5571,12 @@ msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
@@ -5962,6 +6068,33 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "s�lectionner la cl� secondaire N"
+
+#~ msgid "list signatures"
+#~ msgstr "lister les signatures"
+
+#~ msgid "sign the key"
+#~ msgstr "signer la cl�"
+
+#~ msgid "add a secondary key"
+#~ msgstr "ajouter une cl� secondaire"
+
+#~ msgid "delete signatures"
+#~ msgstr "supprimer les signatures"
+
+#~ msgid "change the expire date"
+#~ msgstr "changer la date d'expiration"
+
+#~ msgid "set preference list"
+#~ msgstr "donner la liste de pr�f�rences"
+
+#~ msgid "updated preferences"
+#~ msgstr "pr�f�rences mises � jour"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Pas de cl� secondaire avec l'index %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key utilisateur"
 
@@ -6075,9 +6208,6 @@ msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 #~ msgid "delphoto"
 #~ msgstr "suppr.photo"
 
-#~ msgid "addkey"
-#~ msgstr "aj.cl�"
-
 #~ msgid "addcardkey"
 #~ msgstr "ajcl�carte"
 
diff --git a/po/gl.po b/po/gl.po
index dd728a433..021161693 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -28,9 +28,9 @@ msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -66,8 +66,8 @@ msgstr "non se pode ler de `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -124,146 +124,149 @@ msgstr ""
 "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
 "m�is entrop�a (Prec�sanse %d bytes m�is)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -298,7 +301,7 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
@@ -315,7 +318,7 @@ msgstr "fin de ficheiro prematura (no CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
@@ -329,23 +332,23 @@ msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
@@ -355,15 +358,15 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
@@ -371,150 +374,150 @@ msgstr "�A s�a selecci�n? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -522,132 +525,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -655,47 +658,47 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita o contrasinal: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -705,14 +708,14 @@ msgstr "non se puido abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -907,32 +910,32 @@ msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVISO: a chave secreta %08lX non ten unha suma de comprobaci�n SK simple\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -940,128 +943,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1071,51 +1074,51 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1123,7 +1126,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1143,17 +1146,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1163,7 +1166,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1171,462 +1174,462 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1634,23 +1637,23 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -1659,54 +1662,54 @@ msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "toma-las chaves deste chaveiro"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2033,393 +2036,414 @@ msgstr "Non hai axuda dispo�ible"
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "�a chave p�blica con coincide coa chave secreta!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "om�tese: a chave secreta xa est� presente\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "om�tese: a chave secreta xa est� presente\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2435,51 +2459,51 @@ msgstr "chaveiro `%s' creado\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2491,53 +2515,53 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2546,11 +2570,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2559,11 +2583,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2572,54 +2596,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2628,32 +2652,32 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2662,91 +2686,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2754,11 +2787,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2766,373 +2799,418 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "selecciona-la chave secundaria N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "listar sinaturas"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "asina-la chave"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "engadir unha chave secundaria"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "borrar sinaturas"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+"seleccionados? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "cambia-la fecha de expiraci�n"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "estabrece-la lista de preferencias"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "preferencias actualizadas"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+"seleccionados? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revocar sinaturas"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "deshabilitar unha chave"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "deshabilitar unha chave"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "�Realmente quere revocar esta chave? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Esta chave pode estar revocada por %s chave "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3140,19 +3218,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3160,7 +3238,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3169,47 +3247,47 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3219,165 +3297,177 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Non hai chave secundaria con �ndice %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3408,145 +3498,145 @@ msgstr "demasiadas preferencias `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3562,7 +3652,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3578,29 +3668,39 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s non caduca nunca\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "A sinatura caduca o %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3608,12 +3708,12 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3630,44 +3730,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3678,28 +3778,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3707,12 +3807,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3724,7 +3824,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3736,64 +3836,65 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Te�a en conta que non se pode empregar esta chave para cifrar. Pode que\n"
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3801,7 +3902,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3809,40 +3910,40 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3851,65 +3952,67 @@ msgstr ""
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Normativa de sinaturas cr�ticas: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Notaci�n de sinaturas cr�ticas: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3961,131 +4064,131 @@ msgstr "%s: chaveiro creado\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
@@ -4294,89 +4397,89 @@ msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "mire en http://www.gnupg.org/why-not-idea.html para obter m�is informaci�n\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -4424,17 +4527,17 @@ msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
@@ -4473,16 +4576,16 @@ msgstr "non se puido conectar a `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4493,27 +4596,27 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "contrasinal demasiado longo\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "resposta do axente non v�lida\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
@@ -5052,22 +5155,22 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 msgid "protection digest %d is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Contrasinal non v�lido; por favor, t�nteo de novo"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra "
 "vez.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "xerando o checksum de 16-bits a extinguir para a protecci�n da chave "
@@ -5443,12 +5546,12 @@ msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
@@ -5926,6 +6029,33 @@ msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "selecciona-la chave secundaria N"
+
+#~ msgid "list signatures"
+#~ msgstr "listar sinaturas"
+
+#~ msgid "sign the key"
+#~ msgstr "asina-la chave"
+
+#~ msgid "add a secondary key"
+#~ msgstr "engadir unha chave secundaria"
+
+#~ msgid "delete signatures"
+#~ msgstr "borrar sinaturas"
+
+#~ msgid "change the expire date"
+#~ msgstr "cambia-la fecha de expiraci�n"
+
+#~ msgid "set preference list"
+#~ msgstr "estabrece-la lista de preferencias"
+
+#~ msgid "updated preferences"
+#~ msgstr "preferencias actualizadas"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Non hai chave secundaria con �ndice %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key id-de-usuario"
 
@@ -6029,9 +6159,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/hu.po b/po/hu.po
index c2193e9fd..72451c1d5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -28,9 +28,9 @@ msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 msgid "no entropy gathering module detected\n"
 msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -67,8 +67,8 @@ msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -123,146 +123,149 @@ msgstr ""
 "m�st, hogy az oper�ci�s rendszer entr�pi�t gy�jthessen!\n"
 "(M�g %d b�jt sz�ks�ges.)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
@@ -297,7 +300,7 @@ msgstr "V�ratlan p�nc�l:"
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
@@ -314,7 +317,7 @@ msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
@@ -328,22 +331,22 @@ msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
@@ -353,15 +356,15 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
@@ -369,150 +372,150 @@ msgstr "Mit v�laszt? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -520,132 +523,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -653,44 +656,44 @@ msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -700,14 +703,14 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
@@ -897,31 +900,31 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -929,128 +932,128 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1060,51 +1063,51 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1112,7 +1115,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1132,15 +1135,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1150,7 +1153,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1158,459 +1161,459 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1618,23 +1621,23 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -1643,55 +1646,55 @@ msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2025,385 +2028,406 @@ msgstr "Nem �ll rendelkez�sre seg�ts�g."
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2419,51 +2443,51 @@ msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2476,53 +2500,53 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2531,11 +2555,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2544,11 +2568,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2557,54 +2581,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2613,32 +2637,32 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2647,91 +2671,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2739,11 +2772,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2751,371 +2784,412 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "N. m�sodlagos kulcs kiv�laszt�sa"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "al��r�sok kilist�z�sa"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "kulcs al��r�sa"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "m�sodlagos kulcs (alkulcs) hozz�ad�sa"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "al��r�sok t�rl�se"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "lej�rat megv�ltoztat�sa"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "preferencialista be�ll�t�sa"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "preferenci�k friss�t�se"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "al��r�sok visszavon�sa"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "kulcs tilt�sa"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "kulcs tilt�sa"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Val�ban visszavonja ezt a kulcsot? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3123,19 +3197,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3143,7 +3217,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3153,45 +3227,45 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3201,162 +3275,174 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Nincs %d index� m�sodlagos kulcs!\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
@@ -3386,145 +3472,145 @@ msgstr "T�l sok \"%c\" preferencia.\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3540,7 +3626,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3556,29 +3642,39 @@ msgstr ""
 "      <n>m = az al��r�s n h�napig �rv�nyes\n"
 "      <n>y = az al��r�s n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s soha nem j�r le.\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Az al��r�s lej�r: %s.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3586,12 +3682,12 @@ msgstr ""
 "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
 "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3608,44 +3704,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3656,28 +3752,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3685,12 +3781,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3702,7 +3798,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3714,112 +3810,113 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Ez a kulcs nem haszn�lhat� titkos�t�sra. Ha egy m�sodlagos kulcsot\n"
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3828,65 +3925,67 @@ msgstr ""
 msgid "never     "
 msgstr "soha      "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Kritikus al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Kritikus al��r�s-jel�l�s: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [lej�r: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3939,131 +4038,131 @@ msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
@@ -4274,88 +4373,88 @@ msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "Tov�bbi inform�ci�t a http://www.gnupg.org/why-not-idea.html oldalon tal�l.\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -4404,17 +4503,17 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@ -4453,18 +4552,18 @@ msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4476,27 +4575,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
@@ -5033,21 +5132,21 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 msgid "protection digest %d is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "�rv�nytelen jelsz�. Pr�b�lja �jra"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "FIGYELEM: Gyenge kulcsot tal�ltam. K�rem, v�ltoztassa meg ism�t a jelsz�t!\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Elavult, 16 bites ellen�rz��sszeget hozok l�tre titkos kulcs v�delm�hez.\n"
@@ -5415,12 +5514,12 @@ msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Nem tudok %d karaktern�l hosszabb sz�vegsorokat kezelni!\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
@@ -5897,6 +5996,33 @@ msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "N. m�sodlagos kulcs kiv�laszt�sa"
+
+#~ msgid "list signatures"
+#~ msgstr "al��r�sok kilist�z�sa"
+
+#~ msgid "sign the key"
+#~ msgstr "kulcs al��r�sa"
+
+#~ msgid "add a secondary key"
+#~ msgstr "m�sodlagos kulcs (alkulcs) hozz�ad�sa"
+
+#~ msgid "delete signatures"
+#~ msgstr "al��r�sok t�rl�se"
+
+#~ msgid "change the expire date"
+#~ msgstr "lej�rat megv�ltoztat�sa"
+
+#~ msgid "set preference list"
+#~ msgstr "preferencialista be�ll�t�sa"
+
+#~ msgid "updated preferences"
+#~ msgstr "preferenci�k friss�t�se"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Nincs %d index� m�sodlagos kulcs!\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key felh-azonos�t�"
 
@@ -6000,9 +6126,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/id.po b/po/id.po
index 65d7ae9fc..f02810cda 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -30,9 +30,9 @@ msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -68,8 +68,8 @@ msgstr "tidak dapat membaca `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -124,146 +124,149 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -298,7 +301,7 @@ msgstr "armor tidak terduga:"
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
@@ -315,7 +318,7 @@ msgstr "eof prematur (dalam CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
@@ -329,23 +332,23 @@ msgstr "eof prematur (dalam Trailer)\n"
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
@@ -355,15 +358,15 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
@@ -371,150 +374,150 @@ msgstr "Pilihan anda? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -522,132 +525,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -655,44 +658,44 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ulangi passphrase: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -702,14 +705,14 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
@@ -900,32 +903,32 @@ msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -933,128 +936,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1064,51 +1067,51 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1116,7 +1119,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1136,15 +1139,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1154,7 +1157,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1162,467 +1165,467 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1630,23 +1633,23 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -1655,52 +1658,52 @@ msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "mengambil kunci ini dari keyring"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2040,382 +2043,403 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "dilewati: kunci pribadi telah ada\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "dilewati: kunci pribadi telah ada\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2431,51 +2455,51 @@ msgstr "%s: keyring tercipta\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2488,53 +2512,53 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2543,11 +2567,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2556,13 +2580,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2571,43 +2595,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2615,11 +2639,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2629,32 +2653,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2663,91 +2687,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2755,11 +2788,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2767,371 +2800,412 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "pilih kunci sekunder N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "tampilkan signature"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "batalkan signature"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "tandai kunci"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "tambah kunci sekunder"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "hapus signature"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "ubah tanggal kadaluarsa"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "set daftar preferensi"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "perbarui preferensi"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "batalkan signature"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "tiadakan kunci"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "tiadakan kunci"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Anda ingin membatalkan kunci ini? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3139,19 +3213,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3159,7 +3233,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3169,45 +3243,45 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3217,165 +3291,177 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Tidak ada kunci sekunder dengan index %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
@@ -3405,145 +3491,145 @@ msgstr "terlalu banyak preferensi `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3559,7 +3645,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3575,29 +3661,39 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s tidak pernah berakhir\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature kadaluarsa pada %s \n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3605,12 +3701,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3626,44 +3722,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3673,27 +3769,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3701,12 +3797,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3719,7 +3815,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3731,111 +3827,112 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Perhatikan bahwa kunci ini tidak dapat digunakan untuk enkripsi. Anda \n"
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3844,65 +3941,67 @@ msgstr ""
 msgid "never     "
 msgstr "tidak pernah..."
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Kebijakan signature kritis: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3954,130 +4053,130 @@ msgstr "%s: keyring tercipta\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
@@ -4286,87 +4385,87 @@ msgstr "signature model lama (PGP 2.X)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih "
 "lanjut\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -4414,16 +4513,16 @@ msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -4462,16 +4561,16 @@ msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4482,27 +4581,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "passphrase terlalu panjang\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "respon tidak valid dari agen\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
@@ -5041,20 +5140,20 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 msgid "protection digest %d is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase tidak valid; silakan coba lagi"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "membuat checksum 16-bit terdepresiasi untuk proteksi kunci rahasia\n"
 
@@ -5421,12 +5520,12 @@ msgstr "%s: gagal menambahkan record: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
@@ -5903,6 +6002,33 @@ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "pilih kunci sekunder N"
+
+#~ msgid "list signatures"
+#~ msgstr "tampilkan signature"
+
+#~ msgid "sign the key"
+#~ msgstr "tandai kunci"
+
+#~ msgid "add a secondary key"
+#~ msgstr "tambah kunci sekunder"
+
+#~ msgid "delete signatures"
+#~ msgstr "hapus signature"
+
+#~ msgid "change the expire date"
+#~ msgstr "ubah tanggal kadaluarsa"
+
+#~ msgid "set preference list"
+#~ msgstr "set daftar preferensi"
+
+#~ msgid "updated preferences"
+#~ msgstr "perbarui preferensi"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Tidak ada kunci sekunder dengan index %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
@@ -6006,9 +6132,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/it.po b/po/it.po
index 40ee95fc9..db8a29e2c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -28,9 +28,9 @@ msgstr "impossibile generare un numero primo di meno di %d bit\n"
 msgid "no entropy gathering module detected\n"
 msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -67,8 +67,8 @@ msgstr "impossibile leggere `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -125,146 +125,149 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
@@ -299,7 +302,7 @@ msgstr "armatura inaspettata:"
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
@@ -316,7 +319,7 @@ msgstr "eof prematura (nel CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
@@ -330,23 +333,23 @@ msgstr "eof prematura (nella coda)\n"
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
@@ -356,15 +359,15 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
@@ -372,151 +375,151 @@ msgstr "Cosa scegli? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -524,132 +527,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -657,44 +660,44 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -704,14 +707,14 @@ msgstr "impossibile aprire `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
@@ -912,31 +915,31 @@ msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -944,128 +947,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1075,51 +1078,51 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1127,7 +1130,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1147,15 +1150,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1165,7 +1168,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1173,464 +1176,464 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1638,23 +1641,23 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -1663,53 +1666,53 @@ msgstr "l'URL della politica di firma indicato non � valido\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "prende le chiavi da questo portachiavi"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2050,385 +2053,406 @@ msgstr "Non � disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "saltata: chiave pubblica gi� presente\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "saltata: chiave pubblica gi� presente\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2444,51 +2468,51 @@ msgstr "portachiavi `%s' creato\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2501,53 +2525,53 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2556,11 +2580,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2569,11 +2593,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2582,43 +2606,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2626,11 +2650,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2640,32 +2664,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2674,91 +2698,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Parti della chiave segreta non sono disponibili.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2766,11 +2799,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2778,371 +2811,412 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "scegli la chiave secondaria N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "elenca le firme"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revoca firme"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "firma la chiave"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Suggerimento: seleziona gli user ID da firmare\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "aggiungi una chiave secondaria"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "cancella le firme"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "cambia la data di scadenza"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "imposta la lista di preferenze"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "preferenze aggiornate"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revoca firme"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "disabilita una chiave"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "disabilita una chiave"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Vuoi davvero revocare questa chiave? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Questa chiave pu� essere revocata dalla chiave %s "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3151,19 +3225,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3172,7 +3246,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3181,46 +3255,46 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3230,168 +3304,180 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Nessuna chiave secondaria con l'indice %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3422,145 +3508,145 @@ msgstr "ci sono troppe preferenze `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3576,7 +3662,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3592,29 +3678,39 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s non ha scadenza\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Questa firma scadr� il %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3622,12 +3718,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3644,44 +3740,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3692,27 +3788,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3720,12 +3816,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3737,7 +3833,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3749,64 +3845,65 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Nota che questa chiave non pu� essere usata per cifrare. Forse vorrai usare\n"
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3814,7 +3911,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3822,40 +3919,40 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3864,65 +3961,67 @@ msgstr ""
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Politica critica di firma: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3976,46 +4075,46 @@ msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4023,84 +4122,84 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
@@ -4308,88 +4407,88 @@ msgstr "firma vecchio stile (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo di cifratura non implementato"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea."
 "html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Non compresso"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -4439,18 +4538,18 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -4489,16 +4588,16 @@ msgstr "impossibile connettersi a `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4509,27 +4608,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "passphrase troppo lunga\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "risposta non valida dall'agent\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
@@ -5072,22 +5171,22 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase non valida; riprova"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "genero il checksum a 16 bit deprecato per la protezione della chiave "
@@ -5469,12 +5568,12 @@ msgstr "%s: accodatura a un record fallita: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
@@ -5952,6 +6051,33 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "scegli la chiave secondaria N"
+
+#~ msgid "list signatures"
+#~ msgstr "elenca le firme"
+
+#~ msgid "sign the key"
+#~ msgstr "firma la chiave"
+
+#~ msgid "add a secondary key"
+#~ msgstr "aggiungi una chiave secondaria"
+
+#~ msgid "delete signatures"
+#~ msgstr "cancella le firme"
+
+#~ msgid "change the expire date"
+#~ msgstr "cambia la data di scadenza"
+
+#~ msgid "set preference list"
+#~ msgstr "imposta la lista di preferenze"
+
+#~ msgid "updated preferences"
+#~ msgstr "preferenze aggiornate"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Nessuna chiave secondaria con l'indice %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
@@ -6055,9 +6181,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/ja.po b/po/ja.po
index 8da5aaeb4..9a6842839 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: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -31,9 +31,9 @@ msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -69,8 +69,8 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -124,143 +124,146 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, c-format
 msgid "error getting serial number: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 msgid "reading the key failed\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
@@ -293,7 +296,7 @@ msgstr "ͽ����������: "
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
@@ -310,7 +313,7 @@ msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
@@ -323,23 +326,23 @@ msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA��Ȥä��ΤǤ��礦\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
@@ -349,14 +352,14 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "�����? "
 
@@ -364,138 +367,138 @@ msgstr "�����? "
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -506,116 +509,116 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -623,7 +626,7 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -632,37 +635,37 @@ msgstr ""
 "���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 msgid "Repeat this PIN: "
 msgstr "PIN�������: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -672,14 +675,14 @@ msgstr "��%s�פ������ޤ���\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɽФ����顼: %s\n"
@@ -862,30 +865,30 @@ msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -893,127 +896,127 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1023,55 +1026,55 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1080,7 +1083,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1100,15 +1103,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1118,7 +1121,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1126,471 +1129,471 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -1598,53 +1601,53 @@ msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 msgid "[User ID not found]"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2420
-#, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+#: g10/getkey.c:2458
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1976,377 +1979,398 @@ msgstr "�إ�פϤ���ޤ���"
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      ����������: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  �����������: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:547
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
 msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
+
+#: g10/import.c:1680
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "����������̩�����ȹ礷�ޤ���!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2362,51 +2386,51 @@ msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2417,17 +2441,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2436,36 +2460,36 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2474,11 +2498,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2487,11 +2511,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2500,53 +2524,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 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:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2555,32 +2579,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2589,66 +2613,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "�縰����̩��ʬ�������ޤ���\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2656,11 +2689,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2669,354 +2702,398 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "����N������"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "��̾�ΰ���"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "���ؽ�̾"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "�������ɲ�"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "��̾�κ��"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "��λ�����ѹ�"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "�������������"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "�����ΰ����򹹿�"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
+#: g10/keyedit.c:1360
+#, fuzzy
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "��̾�μ���"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "���λ��Ѥ�ػߤ���"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "���λ��Ѥ�ػߤ���"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1759
-msgid "Do you really want to revoke the selected keys? (y/N) "
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "���θ��������˼������ޤ���? (y/N) "
+
+#: g10/keyedit.c:1822
+#, fuzzy
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1760
-msgid "Do you really want to revoke this key? (y/N) "
+#: g10/keyedit.c:1824
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
+
+#: g10/keyedit.c:2384
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3024,17 +3101,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3042,7 +3119,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3051,45 +3128,45 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3098,154 +3175,166 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "%d�֤������Ϥ���ޤ���\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -3272,143 +3361,143 @@ msgstr "¿�����밵������\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3424,7 +3513,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3440,29 +3529,39 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s��̵���¤Ǥ�\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "���ν�̾��%s����λ�Ǥ�\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3470,11 +3569,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3490,44 +3589,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3538,27 +3637,27 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3566,12 +3665,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3583,7 +3682,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3594,107 +3693,108 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr "RSA��ˡ(modulus)��Ĺ����%d�Ǥ���ޤ���\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr "RSA���ǿ���%d�Ǥ���ޤ���\n"
@@ -3703,64 +3803,66 @@ msgstr "RSA���ǿ���%d�Ǥ���ޤ���\n"
 msgid "never     "
 msgstr "̵����    "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "��̾�ݥꥷ��: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr "����������������: "
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "����ƥ�����ʽ�̾����: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, c-format
 msgid "expired: %s)"
 msgstr "��λ: %s)"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
@@ -3813,123 +3915,123 @@ msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
@@ -4137,84 +4239,84 @@ msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "̵����"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -4261,16 +4363,16 @@ msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -4309,16 +4411,16 @@ msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4329,27 +4431,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "����������Ȥ����̵���ʱ���\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
@@ -4862,20 +4964,20 @@ msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 msgid "protection digest %d is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
 
@@ -5218,12 +5320,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϡ���갷���ޤ���\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
@@ -5699,6 +5801,33 @@ msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "����N������"
+
+#~ msgid "list signatures"
+#~ msgstr "��̾�ΰ���"
+
+#~ msgid "sign the key"
+#~ msgstr "���ؽ�̾"
+
+#~ msgid "add a secondary key"
+#~ msgstr "�������ɲ�"
+
+#~ msgid "delete signatures"
+#~ msgstr "��̾�κ��"
+
+#~ msgid "change the expire date"
+#~ msgstr "��λ�����ѹ�"
+
+#~ msgid "set preference list"
+#~ msgstr "�������������"
+
+#~ msgid "updated preferences"
+#~ msgstr "�����ΰ����򹹿�"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "%d�֤������Ϥ���ޤ���\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key �桼����id"
 
@@ -5810,9 +5939,6 @@ msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #~ msgid "addcardkey"
 #~ msgstr "addcardkey"
 
diff --git a/po/pl.po b/po/pl.po
index 13d1b933c..0709d3db2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -38,9 +38,9 @@ msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 msgid "no entropy gathering module detected\n"
 msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -77,8 +77,8 @@ msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -139,146 +139,149 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
@@ -313,7 +316,7 @@ msgstr "nieoczekiwane opakowanie:"
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
@@ -330,7 +333,7 @@ msgstr "przedwczesny koniec pliku (w CRC)\n"
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
@@ -344,23 +347,23 @@ msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "brak klucza prywatnego"
@@ -370,15 +373,15 @@ msgstr "brak klucza prywatnego"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
@@ -386,152 +389,152 @@ msgstr "Tw�j wyb�r? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "w�kl"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "w�kl"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "nie podano przyczyny"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "nie zosta� przetworzony"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -539,132 +542,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
@@ -672,47 +675,47 @@ msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Powt�rz has�o: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -722,14 +725,14 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
@@ -920,31 +923,31 @@ msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -952,128 +955,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1083,51 +1086,51 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1135,7 +1138,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1156,15 +1159,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1174,7 +1177,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1182,73 +1185,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1256,21 +1259,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1278,378 +1281,378 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1657,23 +1660,23 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -1682,53 +1685,53 @@ msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "pobieranie kluczy z tego zbioru"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2057,386 +2060,407 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2452,52 +2476,52 @@ msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2510,53 +2534,53 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2565,11 +2589,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2578,11 +2602,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2591,56 +2615,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2649,32 +2673,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2683,90 +2707,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2774,11 +2807,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2786,372 +2819,415 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "wyb�r podklucza N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "lista podpis�w"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "z�o�enie podpisu na kluczu"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "dodanie podklucza"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "dodkl"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "usuni�cie podpis�w"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "zmiana daty wa�no�ci klucza"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "ustawienie opcji klucza"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "aktualizacja ustawie� klucza"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "uniewa�nienie podpisu"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "wy��czy� klucz z u�ycia"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "wy��czy� klucz z u�ycia"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3159,19 +3235,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3180,7 +3256,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3189,45 +3265,45 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3237,162 +3313,174 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Brak podklucza o numerze %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
@@ -3422,145 +3510,145 @@ msgstr "zbyt wiele `%c' ustawie�\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "podpis"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "szyfrowanie danych"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3576,7 +3664,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3592,29 +3680,39 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s nie ma daty wa�no�ci\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Wa�no�� podpisu wygasa %s.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3622,12 +3720,12 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3644,44 +3742,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3692,43 +3790,43 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
 "komentarza.\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3740,7 +3838,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3756,63 +3854,64 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3820,7 +3919,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3828,41 +3927,41 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3871,65 +3970,67 @@ msgstr ""
 msgid "never     "
 msgstr "nigdy     "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Krytyczny regulamin podpisu: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3981,130 +4082,130 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "wy�kl"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
@@ -4314,85 +4415,85 @@ msgstr "podpis starego typu (PGP 2.x).\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "wi�cej informacji jest tutaj: http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
@@ -4440,18 +4541,18 @@ msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -4490,16 +4591,16 @@ msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4510,27 +4611,27 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "has�o zbyt d�ugie\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "b��dna odpowied� agenta\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
@@ -5072,21 +5173,21 @@ msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 msgid "protection digest %d is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Niepoprawne has�o; prosz� spr�bowa� ponownie"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� has�o.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "tworzenie przestarza�ej 16-bitowej sumy kontrolnej dla ochrony klucza\n"
@@ -5458,12 +5559,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
@@ -5940,6 +6041,33 @@ msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "wyb�r podklucza N"
+
+#~ msgid "list signatures"
+#~ msgstr "lista podpis�w"
+
+#~ msgid "sign the key"
+#~ msgstr "z�o�enie podpisu na kluczu"
+
+#~ msgid "add a secondary key"
+#~ msgstr "dodanie podklucza"
+
+#~ msgid "delete signatures"
+#~ msgstr "usuni�cie podpis�w"
+
+#~ msgid "change the expire date"
+#~ msgstr "zmiana daty wa�no�ci klucza"
+
+#~ msgid "set preference list"
+#~ msgstr "ustawienie opcji klucza"
+
+#~ msgid "updated preferences"
+#~ msgstr "aktualizacja ustawie� klucza"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Brak podklucza o numerze %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key nazwa u�ytkownika"
 
@@ -6044,9 +6172,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "delphoto"
 #~ msgstr "usfoto"
 
-#~ msgid "addkey"
-#~ msgstr "dodkl"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "dodkl"
@@ -7017,9 +7142,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgstr ""
 #~ "lid %lu: identyfikator u�ytkownika nie zosta� odnaleziony w bloku klucza\n"
 
-#~ msgid "lid %lu: user id without signature\n"
-#~ msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
-
 #~ msgid "lid %lu: self-signature in hintlist\n"
 #~ msgstr "lid %lu: podpis klucza nim samym w li�cie domy�lnej\n"
 
diff --git a/po/pt.po b/po/pt.po
index 7a43ba850..07f5b44e8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -31,9 +31,9 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -70,8 +70,8 @@ msgstr "imposs�vel ler `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -123,146 +123,149 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
@@ -297,7 +300,7 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
@@ -314,7 +317,7 @@ msgstr "fim de ficheiro prematuro (no CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
@@ -328,23 +331,23 @@ msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -354,15 +357,15 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Op��o? "
 
@@ -370,150 +373,150 @@ msgstr "Op��o? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -521,132 +524,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -654,44 +657,44 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -701,14 +704,14 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -900,31 +903,31 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -932,128 +935,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1063,55 +1066,55 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1119,7 +1122,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1139,15 +1142,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1157,7 +1160,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1165,462 +1168,462 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1628,23 +1631,23 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -1653,57 +1656,57 @@ msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2034,385 +2037,405 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
+#: g10/import.c:2238
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr ""
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "ignorado: a chave secreta j� est� presente\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "ignorado: a chave secreta j� est� presente\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2428,51 +2451,51 @@ msgstr "porta-chaves `%s' criado\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2485,53 +2508,53 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2540,11 +2563,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2553,12 +2576,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2567,55 +2590,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2625,31 +2648,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2658,91 +2681,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2750,11 +2782,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2762,372 +2794,415 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "seleciona chave secund�ria N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "lista assinaturas"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "assina a chave"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "adiciona nova chave secund�ria"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "remove assinaturas"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "muda a data de validade"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "configurar lista de prefer�ncias"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "prefer�ncias actualizadas"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revoga assinaturas"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "desactiva uma chave"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "desactiva uma chave"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Voc� quer realmente revogar esta chave? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Esta chave pode ser revogada pela chave %s "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3135,25 +3210,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
 msgstr ""
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3162,46 +3237,46 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3210,161 +3285,173 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Nenhuma chave secund�ria com �ndice %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3395,145 +3482,145 @@ msgstr "demasiadas prefer�ncias `%c'\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3549,7 +3636,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3565,29 +3652,39 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "A %s n�o expira nunca\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Esta assinatura expirou em %s.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3595,12 +3692,12 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3618,44 +3715,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3666,29 +3763,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
 "coment�rio\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3696,12 +3793,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3713,7 +3810,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3725,63 +3822,64 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3789,7 +3887,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3797,40 +3895,40 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3839,65 +3937,67 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Politica de assinatura cr�tica: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Nota��o de assinatura cr�tica: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3949,130 +4049,130 @@ msgstr "%s: porta-chaves criado\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
@@ -4285,88 +4385,88 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "veja http://www.gnupg.org/why-not-idea.html para mais informa��es\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -4414,16 +4514,16 @@ msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -4462,16 +4562,16 @@ msgstr "imposs�vel ligar a `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4484,27 +4584,27 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
@@ -5038,21 +5138,21 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "a gerar a 'checksum' (depreciada) de 16-bit para protec��o da chave secreta\n"
@@ -5419,12 +5519,12 @@ msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -5905,6 +6005,33 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "seleciona chave secund�ria N"
+
+#~ msgid "list signatures"
+#~ msgstr "lista assinaturas"
+
+#~ msgid "sign the key"
+#~ msgstr "assina a chave"
+
+#~ msgid "add a secondary key"
+#~ msgstr "adiciona nova chave secund�ria"
+
+#~ msgid "delete signatures"
+#~ msgstr "remove assinaturas"
+
+#~ msgid "change the expire date"
+#~ msgstr "muda a data de validade"
+
+#~ msgid "set preference list"
+#~ msgstr "configurar lista de prefer�ncias"
+
+#~ msgid "updated preferences"
+#~ msgstr "prefer�ncias actualizadas"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Nenhuma chave secund�ria com �ndice %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key id-utilizador"
 
@@ -6008,9 +6135,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index eb761785d..4c0491f95 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -35,9 +35,9 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -74,8 +74,8 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
@@ -128,146 +128,149 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
@@ -302,7 +305,7 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
@@ -319,7 +322,7 @@ msgstr "fim de arquivo prematuro (no CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
@@ -333,23 +336,23 @@ msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caractere \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -359,15 +362,15 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
@@ -375,151 +378,151 @@ msgstr "Sua op��o? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -527,133 +530,133 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -661,47 +664,47 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -711,14 +714,14 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -906,31 +909,31 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -938,134 +941,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1075,61 +1078,61 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1149,15 +1152,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1167,7 +1170,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1175,468 +1178,468 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1645,26 +1648,26 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1673,57 +1676,57 @@ msgstr "a URL de pol�tica dada � inv�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 #, fuzzy
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -1999,380 +2002,401 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "lid %lu n�o tem chave\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "ignorado: a chave secreta j� est� presente\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "ignorado: a chave secreta j� est� presente\n"
+
 #: g10/keydb.c:167
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2388,51 +2412,51 @@ msgstr "%s: chaveiro criado\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2451,162 +2475,162 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2615,81 +2639,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "chave secreta n�o dispon�vel"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2697,12 +2730,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2710,611 +2743,660 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "seleciona chave secund�ria N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "lista assinaturas"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "assina a chave"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "lid %lu: id de usu�rio sem assinatura\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "adiciona nova chave secund�ria"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "remove assinaturas"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "muda a data de validade"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1322
+#: g10/keyedit.c:1357
 #, fuzzy
-msgid "set preference list"
-msgstr "lista prefer�ncias"
+msgid "set preference list for the selected user IDs"
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "updated preferences"
-msgstr "lista prefer�ncias"
-
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
-msgstr ""
+msgid "set preferred keyserver URL for the selected user IDs"
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revoga assinaturas"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1366
 #, fuzzy
-msgid "revoke a user ID"
+msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "desativa uma chave"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "desativa uma chave"
+
+#: g10/keyedit.c:1372
+msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Voc� realmente quer revogar esta chave? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
 msgstr ""
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Nenhuma chave secund�ria com �ndice %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3347,147 +3429,147 @@ msgstr "Prefer�ncias demais"
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3503,7 +3585,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3520,30 +3602,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1571
-#, fuzzy, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
+msgstr "A chave n�o expira nunca\n"
+
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1578
+#: g10/keygen.c:1583
 #, fuzzy, c-format
-msgid "%s expires at %s\n"
+msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3551,12 +3643,12 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3573,44 +3665,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3621,28 +3713,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3650,12 +3742,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3667,7 +3759,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3679,63 +3771,64 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3743,7 +3836,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3751,40 +3844,40 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3793,73 +3886,75 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3911,130 +4006,130 @@ msgstr "%s: chaveiro criado\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
@@ -4248,86 +4343,86 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -4375,16 +4470,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -4423,16 +4518,16 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4444,30 +4539,30 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linha muito longa\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
@@ -5005,22 +5100,22 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
@@ -5377,12 +5472,12 @@ msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -5867,6 +5962,35 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "seleciona chave secund�ria N"
+
+#~ msgid "list signatures"
+#~ msgstr "lista assinaturas"
+
+#~ msgid "sign the key"
+#~ msgstr "assina a chave"
+
+#~ msgid "add a secondary key"
+#~ msgstr "adiciona nova chave secund�ria"
+
+#~ msgid "delete signatures"
+#~ msgstr "remove assinaturas"
+
+#~ msgid "change the expire date"
+#~ msgstr "muda a data de validade"
+
+#, fuzzy
+#~ msgid "set preference list"
+#~ msgstr "lista prefer�ncias"
+
+#, fuzzy
+#~ msgid "updated preferences"
+#~ msgstr "lista prefer�ncias"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Nenhuma chave secund�ria com �ndice %d\n"
+
 #, fuzzy
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--sign-key id-usu�rio"
@@ -5970,9 +6094,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "deluid"
 #~ msgstr "deluid"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
@@ -6866,9 +6987,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "lid %lu: user id not found in keyblock\n"
 #~ msgstr "lid %lu: id de usu�rio n�o encontrado no bloco de chaves\n"
 
-#~ msgid "lid %lu: user id without signature\n"
-#~ msgstr "lid %lu: id de usu�rio sem assinatura\n"
-
 #~ msgid "lid %lu: self-signature in hintlist\n"
 #~ msgstr "lid %lu: auto-assinatura na lista de sugest�es\n"
 
diff --git a/po/ro.po b/po/ro.po
index 99918389e..4a480d7f5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,17 +1,17 @@
 # Mesajele �n limba rom�n� pentru gnupg.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Acest fi�ier este distribuit sub aceea�i licen�� ca �i pachetul gnupg.
-# Laurentiu Buzdugan <[email protected]>, 2003.
+# Laurentiu Buzdugan <[email protected]>, 2003, 2004.
 #
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.2\n"
+"Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
-"PO-Revision-Date: 2004-06-17 12:00-0500\n"
-"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
+"PO-Revision-Date: 2004-12-28 12:00-0500\n"
+"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: cipher/primegen.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
+msgstr "nu pot genera un num�r prim cu  pbi�i=%u qbi�i=%u\n"
 
 #: cipher/primegen.c:311
 #, c-format
@@ -32,9 +32,9 @@ msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
 msgid "no entropy gathering module detected\n"
 msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -72,8 +72,8 @@ msgstr "nu pot citi `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -130,149 +130,146 @@ msgstr ""
 "a da sistemului de operare o �ans� de a colecta mai mult� entropie\n"
 "(Mai sunt necesari %d octe�i)\n"
 
-#: g10/app-openpgp.c:539
-#, fuzzy, c-format
+#: g10/app-openpgp.c:547
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
+msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: g10/app-openpgp.c:552
-#, fuzzy, c-format
+#: g10/app-openpgp.c:560
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
+msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
-#, fuzzy, c-format
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "trimitere server de chei e�uat�: %s\n"
+msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "cardul este �ncuiat permanent!\n"
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
+msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
-msgstr ""
+msgstr "|A|PIN Admin"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
-msgstr ""
+msgstr "|AN|PIN Admin Nou"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
-msgstr ""
+msgstr "|N|PIN Nou"
 
-#: g10/app-openpgp.c:1025
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1022
+#, c-format
 msgid "error getting new PIN: %s\n"
-msgstr "eroare la crearea frazei-parol�: %s\n"
+msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
-#, fuzzy
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 msgid "error reading application data\n"
-msgstr "eroare la citire keyblock: %s\n"
+msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
-#, fuzzy
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 msgid "error reading fingerprint DO\n"
-msgstr "%s: eroare citire �nregistrare liber�: %s\n"
+msgstr "eroare la citirea amprentei DO\n"
 
-#: g10/app-openpgp.c:1107
-#, fuzzy
+#: g10/app-openpgp.c:1104
 msgid "key already exists\n"
-msgstr "`%s' deja compresat\n"
+msgstr "cheia exist� deja\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
-msgstr ""
+msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: g10/app-openpgp.c:1113
-#, fuzzy
+#: g10/app-openpgp.c:1110
 msgid "generating new key\n"
-msgstr "genereaz� o nou� perechi de chei"
+msgstr "generez o nou� cheie\n"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
-msgstr ""
+msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: g10/app-openpgp.c:1138
-#, fuzzy
+#: g10/app-openpgp.c:1135
 msgid "generating key failed\n"
-msgstr "stergere keyblock a e�uat: %s\n"
+msgstr "generarea cheii a e�uat\n"
 
-#: g10/app-openpgp.c:1141
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1138
+#, c-format
 msgid "key generation completed (%d seconds)\n"
-msgstr "Generarea cheii a e�uat: %s\n"
+msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
-msgstr ""
+msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
-msgstr ""
+msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
+msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
-msgstr ""
+msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
-msgstr ""
+msgstr "PIN [semn�turi f�cute: %lu]"
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
+msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 
-#: g10/app-openpgp.c:1734
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1731
+#, c-format
 msgid "error getting serial number: %s\n"
-msgstr "eroare la crearea frazei-parol�: %s\n"
+msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: g10/app-openpgp.c:1829
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1826
+#, c-format
 msgid "failed to store the key: %s\n"
-msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
+msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: g10/app-openpgp.c:1871
-#, fuzzy
+#: g10/app-openpgp.c:1868
 msgid "reading the key failed\n"
-msgstr "stergere keyblock a e�uat: %s\n"
+msgstr "citire cheii a e�uat\n"
 
 #: g10/armor.c:317
 #, c-format
@@ -296,18 +293,17 @@ msgid "nested clear text signatures\n"
 msgstr "semn�turi text �n clar �ncuib�rite\n"
 
 #: g10/armor.c:551
-#, fuzzy
 msgid "unexpected armor: "
-msgstr "armur� nea�teptat�:"
+msgstr "armur� nea�teptat�: "
 
 #: g10/armor.c:563
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:715 g10/armor.c:1300
-#, fuzzy, c-format
+#: g10/armor.c:715 g10/armor.c:1322
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "caracter radix64 invalid %02x s�rit\n"
+msgstr "caracter radix64 invalid %02X s�rit\n"
 
 #: g10/armor.c:758
 msgid "premature eof (no CRC)\n"
@@ -321,384 +317,359 @@ msgstr "eof prematur (�n CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
-#, fuzzy, c-format
+#: g10/armor.c:804 g10/armor.c:1359
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "eroare CRC; %06lx - %06lx\n"
+msgstr "eroare CRC; %06lX - %06lX\n"
 
 #: g10/armor.c:824
-#, fuzzy
 msgid "premature eof (in trailer)\n"
-msgstr "eof prematur (�n Trailer)\n"
+msgstr "eof prematur (�n trailer)\n"
 
 #: g10/armor.c:828
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
-#, fuzzy, c-format
+#: g10/card-util.c:58 g10/card-util.c:283
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "cheia secret� nu e disponibil�"
+msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
 #: g10/card-util.c:63
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
 #: g10/card-util.c:194 g10/card-util.c:244
 msgid "[not set]"
-msgstr ""
+msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:378
-#, fuzzy
+#: g10/card-util.c:379
 msgid "male"
-msgstr "activ"
+msgstr "masculin"
 
-#: g10/card-util.c:379
-#, fuzzy
+#: g10/card-util.c:380
 msgid "female"
-msgstr "activ"
+msgstr "feminin"
 
-#: g10/card-util.c:379
-#, fuzzy
+#: g10/card-util.c:380
 msgid "unspecified"
-msgstr "Nici un motiv specificat"
+msgstr "nespecificat(�)"
 
-#: g10/card-util.c:406
-#, fuzzy
+#: g10/card-util.c:407
 msgid "not forced"
-msgstr "neprocesat"
+msgstr "nefor�at(�)"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
-msgstr ""
+msgstr "for�at(�)"
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:521
-#, fuzzy
+#: g10/card-util.c:548
 msgid "URL to retrieve public key: "
-msgstr "nici o cheie public� corespunz�toare: %s\n"
+msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
-msgstr ""
+msgstr "Date DO personale: "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:729
-#, fuzzy
+#: g10/card-util.c:756
 msgid "Language preferences: "
-msgstr "preferin�e actualizate"
+msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:737
-#, fuzzy
+#: g10/card-util.c:764
 msgid "Error: invalid length of preference string.\n"
-msgstr "caracter invalid �n �ir preferin�e\n"
+msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:746
-#, fuzzy
+#: g10/card-util.c:773
 msgid "Error: invalid characters in preference string.\n"
-msgstr "caracter invalid �n �ir preferin�e\n"
+msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:781
-#, fuzzy
+#: g10/card-util.c:808
 msgid "Error: invalid response.\n"
-msgstr "eroare: amprent� invalid�\n"
+msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:802
-#, fuzzy
+#: g10/card-util.c:829
 msgid "CA fingerprint: "
-msgstr "afi�eaz� amprenta"
+msgstr "Amprenta CA: "
 
-#: g10/card-util.c:825
-#, fuzzy
+#: g10/card-util.c:852
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "eroare: amprent� invalid�\n"
+msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:873
-#, fuzzy, c-format
+#: g10/card-util.c:900
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Generarea cheii a e�uat: %s\n"
+msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:874
-#, fuzzy
+#: g10/card-util.c:901
 msgid "not an OpenPGP card"
-msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
+msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:883
-#, fuzzy, c-format
+#: g10/card-util.c:910
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
+msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
+"V� rug�m s� observa�i c� set�rile din fabric� ale PIN-urilor sunt\n"
+"   PIN = `%s'     PIN Admin = `%s'\n"
+"Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1056
-#, fuzzy
+#: g10/card-util.c:1083
 msgid "Please select the type of key to generate:\n"
-msgstr "Selecta�i ce fel de cheie dori�i:\n"
+msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
-#, fuzzy
+#: g10/card-util.c:1085 g10/card-util.c:1165
 msgid "   (1) Signature key\n"
-msgstr "Semn�tur� expirat� %s\n"
+msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
-#, fuzzy
+#: g10/card-util.c:1086 g10/card-util.c:1167
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (numai cifrare)\n"
+msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1135
-#, fuzzy
+#: g10/card-util.c:1162
 msgid "Please select where to store the key:\n"
-msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
+msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1170
-#, fuzzy
+#: g10/card-util.c:1197
 msgid "unknown key protection algorithm\n"
-msgstr "algoritm de protec�ie necunoscut\n"
+msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1175
-#, fuzzy
+#: g10/card-util.c:1202
 msgid "secret parts of key are not available\n"
-msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
+msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1180
-#, fuzzy
+#: g10/card-util.c:1207
 msgid "secret key already stored on a card\n"
-msgstr "s�rit�: cheia secret� deja prezent�\n"
+msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1252
-#, fuzzy
+#: g10/card-util.c:1279
 msgid "show admin commands"
-msgstr "comenzi �n conflict\n"
+msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1255
-#, fuzzy
+#: g10/card-util.c:1282
 msgid "list all available data"
-msgstr "Cheie disponibil� la: "
+msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
-msgstr ""
+msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1261
-#, fuzzy
+#: g10/card-util.c:1288
 msgid "change the login name"
-msgstr "schimb� data de expirare"
+msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1262
-#, fuzzy
+#: g10/card-util.c:1289
 msgid "change the language preferences"
-msgstr "schimb� �ncrederea pentru proprietar"
+msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
-msgstr ""
+msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1264
-#, fuzzy
+#: g10/card-util.c:1291
 msgid "change a CA fingerprint"
-msgstr "afi�eaz� amprenta"
+msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1266
-#, fuzzy
+#: g10/card-util.c:1293
 msgid "generate new keys"
-msgstr "genereaz� o nou� perechi de chei"
+msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
-msgstr ""
+msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1368
-#, fuzzy
+#: g10/card-util.c:1395
 msgid "Admin-only command\n"
-msgstr "comenzi �n conflict\n"
+msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1384
-#, fuzzy
+#: g10/card-util.c:1411
 msgid "Admin commands are allowed\n"
-msgstr "comenzi �n conflict\n"
+msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1386
-#, fuzzy
+#: g10/card-util.c:1413
 msgid "Admin commands are not allowed\n"
-msgstr "scriu cheia secret� �n `%s'\n"
+msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
 #: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
+"V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
+"renun�a: "
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
+"V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de seris:\n"
+"   %.*s\n"
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
-msgstr ""
+msgstr "Introduce�i noul PIN Admin: "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
-msgstr ""
+msgstr "introduce�i noul PIN: "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Introduce�i PIN Admin: "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
-msgstr ""
+msgstr "Introduce�i PIN: "
 
-#: g10/cardglue.c:704
-#, fuzzy
+#: g10/cardglue.c:705
 msgid "Repeat this PIN: "
-msgstr "Repeta�i fraza-parol�: "
+msgstr "Repeta�i acest PIN: "
 
-#: g10/cardglue.c:718
-#, fuzzy
+#: g10/cardglue.c:719
 msgid "PIN not correctly repeated; try again"
-msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
+msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -708,14 +679,14 @@ msgstr "nu pot deschide `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "cheia `%s' nu a fost g�sit�: %s\n"
+msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
@@ -725,19 +696,16 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
 
 #: g10/delkey.c:127
-#, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "nu se poate face acest lucru �n mod batch f�r� \"--yes\"\n"
+msgstr "nu pot face acest lucru �n mod batch f�r� \"--yes\"\n"
 
 #: g10/delkey.c:139
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "�terge�i aceast� cheie din inelul de chei? "
+msgstr "�terge aceast� cheie din inelul de chei? (d/N) "
 
 #: g10/delkey.c:147
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "Aceasta este o cheie secret�! - chiar o �terge�i? "
+msgstr "Aceasta este o cheie secret�! - chiar dori�i s� o �terge�i? (d/N) "
 
 #: g10/delkey.c:157
 #, c-format
@@ -800,18 +768,21 @@ msgstr ""
 "nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
 
 #: g10/encode.c:540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
+msgstr ""
+"AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
+"destinatarului\n"
 
 #: g10/encode.c:648 g10/sign.c:877
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"for��nd algoritmul de compresie %s (%d) viola�i preferin�ele destinatarului\n"
+"AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
+"destinatarului\n"
 
 #: g10/encode.c:735
 #, c-format
@@ -865,21 +836,20 @@ msgstr ""
 "pentru permisiunile fi�ierului\n"
 
 #: g10/exec.c:355
-#, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
 "externe\n"
 
 #: g10/exec.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "nu pot executa %s \"%s\": %s\n"
+msgstr "nu pot executa programul `%s': %s\n"
 
 #: g10/exec.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr "nu pot executa %s \"%s\": %s\n"
+msgstr "nu pot executa shell-ul `%s': %s\n"
 
 #: g10/exec.c:521
 #, c-format
@@ -909,31 +879,30 @@ msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
 
-#: g10/export.c:182
-#, fuzzy
+#: g10/export.c:183
 msgid "exporting secret keys not allowed\n"
-msgstr "scriu cheia secret� �n `%s'\n"
+msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:211
-#, fuzzy, c-format
+#: g10/export.c:212
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "cheia %08lX: nu e protejat� - s�rit�\n"
+msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:219
-#, fuzzy, c-format
+#: g10/export.c:220
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "cheia %08lX: cheie stil PGP 2.x - s�rit�\n"
+msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:384
-#, fuzzy, c-format
+#: g10/export.c:395
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "AVERTISMENT: cheia secret� %08lX nu are un checksum SK simplu\n"
+msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -941,128 +910,127 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/g10.c:374
-#, fuzzy
+#: g10/g10.c:376
 msgid "list and check key signatures"
-msgstr "verific� semn�turile cheii"
+msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
-msgstr ""
+msgstr "afi�eaz� starea cardului"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
-msgstr ""
+msgstr "schimb� data de pe card"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
-msgstr ""
+msgstr "schimb� PIN-ul unui card"
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1072,51 +1040,51 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "locvace"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1124,7 +1092,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1144,15 +1112,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1162,7 +1130,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1170,478 +1138,474 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/g10.c:1017
-#, fuzzy, c-format
+#: g10/g10.c:1021
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "nu am g�sit nici un semn = �n defini�ia grupului \"%s\"\n"
+msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/g10.c:1214
-#, fuzzy, c-format
+#: g10/g10.c:1218
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
+msgstr ""
+"AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/g10.c:1217
-#, fuzzy, c-format
+#: g10/g10.c:1221
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
+msgstr ""
+"AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/g10.c:1220
-#, fuzzy, c-format
+#: g10/g10.c:1224
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
+msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/g10.c:1226
-#, fuzzy, c-format
+#: g10/g10.c:1230
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
+msgstr ""
+"AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/g10.c:1229
-#, fuzzy, c-format
+#: g10/g10.c:1233
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
+msgstr ""
+"AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/g10.c:1232
-#, fuzzy, c-format
+#: g10/g10.c:1236
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
+msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/g10.c:1238
-#, fuzzy, c-format
+#: g10/g10.c:1242
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
-"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
-"\"\n"
+"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
+"directorul home `%s'\n"
 
-#: g10/g10.c:1241
-#, fuzzy, c-format
+#: g10/g10.c:1245
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
-"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
-"\"\n"
+"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
+"configurare `%s'\n"
 
-#: g10/g10.c:1244
-#, fuzzy, c-format
+#: g10/g10.c:1248
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
-"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
-"\"\n"
+"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
+"extensia `%s'\n"
 
-#: g10/g10.c:1250
-#, fuzzy, c-format
+#: g10/g10.c:1254
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
-"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
-"\"\n"
+"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
+"directorul home `%s'\n"
 
-#: g10/g10.c:1253
-#, fuzzy, c-format
+#: g10/g10.c:1257
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
-"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
-"\"\n"
+"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
+"configurare `%s'\n"
 
-#: g10/g10.c:1256
-#, fuzzy, c-format
+#: g10/g10.c:1260
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
-"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
-"\"\n"
+"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
+"extensia `%s'\n"
 
-#: g10/g10.c:1397
-#, fuzzy, c-format
+#: g10/g10.c:1401
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "articol configurare necunoscut \"%s\"\n"
+msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/g10.c:2078
-#, fuzzy, c-format
+#: g10/g10.c:2076
+#, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
-"extensie cifru \"%s\" nu a fost �nc�rcat din cauza permisiunilor nesigure "
+"extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/g10.c:2292
-#, fuzzy, c-format
+#: g10/g10.c:2293
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s nu este un set de carectere valid\n"
+msgstr "`%s' nu este un set de carectere valid\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
-#, fuzzy
+#
+#: g10/g10.c:2312 g10/keyedit.c:3573
 msgid "could not parse keyserver URL\n"
-msgstr "nu am putut interpreta URI pentru serverul de chei\n"
+msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/g10.c:2317
-#, fuzzy, c-format
+#: g10/g10.c:2318
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: op�iuni export invalide\n"
+msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/g10.c:2320
-#, fuzzy
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
-msgstr "op�iuni export invalide\n"
+msgstr "op�iuni server de chei invalide\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2347
-#, fuzzy, c-format
+#: g10/g10.c:2348
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: op�iuni import invalide\n"
+msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/g10.c:2350
-#, fuzzy
+#: g10/g10.c:2351
 msgid "invalid list options\n"
-msgstr "op�iuni import invalide\n"
+msgstr "op�iuni enumerare invalide\n"
 
-#: g10/g10.c:2372
-#, fuzzy, c-format
+#: g10/g10.c:2373
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: op�iuni export invalide\n"
+msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/g10.c:2375
-#, fuzzy
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
-msgstr "op�iuni export invalide\n"
+msgstr "op�iuni verificare invalide\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "nu va rula cu memorie neprotejat� (insecure) datorit� faptului c� %s"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/g10.c:2723
-#, fuzzy
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
-msgstr "algoritm cifrare selectat este invalid\n"
+msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/g10.c:2748
-#, fuzzy
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth trebuie s� fie �n intervalul 1..255\n"
+msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/g10.c:2863
-#, fuzzy, c-format
+#: g10/g10.c:2864
+#, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "nu pute�i folosi algoritmul de cifrare \"%s\" c�t� vreme �n modul %s\n"
+msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2868
-#, fuzzy, c-format
+#: g10/g10.c:2869
+#, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "nu pute�i folosi algorimul de rezumat \"%s\" c�t� vreme �n modul %s\n"
+msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2873
-#, fuzzy, c-format
+#: g10/g10.c:2874
+#, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr ""
-"nu pute�i folosi algoritmul de compresie \"%s\" c�t� vreme �n modul %s\n"
+msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3000
-#, fuzzy, c-format
+#: g10/g10.c:3001
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "decriptarea a e�uat: %s\n"
+msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3023
-#, fuzzy
+#: g10/g10.c:3024
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [nume_fi�ier]"
+msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/g10.c:3028
-#, fuzzy, c-format
+#: g10/g10.c:3029
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3074
-#, fuzzy
+#: g10/g10.c:3075
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [nume_fi�ier]"
+msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/g10.c:3079
-#, fuzzy, c-format
+#: g10/g10.c:3080
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1649,78 +1613,76 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/g10.c:3939
-#, fuzzy
+#: g10/g10.c:3940
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
+msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
 #: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
-#, fuzzy
+#: g10/getkey.c:186 g10/getkey.c:2749
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:1639
-#, fuzzy, c-format
+#: g10/getkey.c:1677
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Cheia invalid� %08lX f�cut� valid� de --allow-non-selfsigned-uid\n"
+msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
-#, fuzzy, c-format
+#: g10/getkey.c:2227
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "nici o subcheie secret� pentru subcheia public� %08lX - ignorat�\n"
+msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
-msgstr "folosim cheia secundar� %08lX �n loc de cheia primar� %08lX\n"
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "folosim cheia secundar� %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2467
-#, fuzzy, c-format
+#: g10/getkey.c:2505
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "cheia %08lX: cheie secret� f�r� cheie public� - s�rit�\n"
+msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "ia cheile de pe acest inel de chei"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1775,6 +1737,17 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"Selecta�i algoritmul de folosit.\n"
+"\n"
+"DSA (aka DSS) este Digital Signature Algorithm �i poate fi folosit numai\n"
+"pentru semn�turi.\n"
+"\n"
+"Elgamal este un algoritm numai pentru cifrare.\n"
+"\n"
+"RSA poate fi folosit pentru semn�turi sau cifrare.\n"
+"\n"
+"Prima cheie (primar�) trebuie s� fie �ntotdeauna o cheie cu care se poate "
+"semna."
 
 #: g10/helptext.c:83
 msgid ""
@@ -1913,7 +1886,6 @@ msgstr ""
 "Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
 
 #: g10/helptext.c:185
-#, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
 
@@ -2058,383 +2030,404 @@ msgstr "Nici un ajutor disponibil"
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:258
-#, fuzzy, c-format
+#: g10/import.c:259
+#, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#: g10/import.c:547
-#, fuzzy
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
-msgstr "A�i semnat aceste ID-uri utilizator:\n"
+msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
+#: g10/import.c:597
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "semn�tur� %s, algoritm rezumat %s\n"
+msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
+"este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
+"aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
+"algoritm\n"
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr ""
+msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:695 g10/import.c:1049
-#, fuzzy, c-format
+#: g10/import.c:696 g10/import.c:1050
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "cheia %08lX: nici un ID utilizator\n"
+msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:715
-#, fuzzy, c-format
+#: g10/import.c:716
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "cheia %08lX: subcheia HPK corupt� a fost reparat�\n"
+msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:730
-#, fuzzy, c-format
+#: g10/import.c:731
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "cheia %08lX: am acceptat ID-ul utilizator ce nu e auto-semnat '%s'\n"
+msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:736
-#, fuzzy, c-format
+#: g10/import.c:737
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "cheia %08lX: nici un ID utilizator valid\n"
+msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:748 g10/import.c:1170
-#, fuzzy, c-format
+#: g10/import.c:749 g10/import.c:1171
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "cheia %08lX: cheia public� nu a fost g�sit�: %s\n"
+msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:754
-#, fuzzy, c-format
+#: g10/import.c:755
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "cheia %08lX: cheie nou� - s�rit�\n"
+msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:793
-#, fuzzy, c-format
+#: g10/import.c:794
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "cheia %08lX: cheia public� \"%s\" importat�\n"
+msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:817
-#, fuzzy, c-format
+#: g10/import.c:818
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "cheia %08lX: nu se potrive�te cu copia noastr�\n"
+msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:834 g10/import.c:1188
-#, fuzzy, c-format
+#: g10/import.c:835 g10/import.c:1189
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "cheia %08lX: nu pot g�si keyblock-ul original: %s\n"
+msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
-#, fuzzy, c-format
+#: g10/import.c:843 g10/import.c:1196
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "cheia %08lX: nu pot citi keyblock-ul original: %s\n"
+msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:874
-#, fuzzy, c-format
+#: g10/import.c:875
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "cheia %08lX: \"%s\" 1 nou ID utilizator\n"
+msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:877
-#, fuzzy, c-format
+#: g10/import.c:878
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "cheia %08lX: \"%s\" %d noi ID-uri utilizator\n"
+msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:880
-#, fuzzy, c-format
+#: g10/import.c:881
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "cheia %08lX: \"%s\" 1 nou� semn�tur�\n"
+msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:883
-#, fuzzy, c-format
+#: g10/import.c:884
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "cheia %08lX: \"%s\" %d noi semn�turi\n"
+msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:886
-#, fuzzy, c-format
+#: g10/import.c:887
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "key %08lX: \"%s\" 1 nou� subcheie\n"
+msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:889
-#, fuzzy, c-format
+#: g10/import.c:890
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "key %08lX: \"%s\" %d noi subchei\n"
+msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:910
-#, fuzzy, c-format
+#: g10/import.c:911
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "key %08lX: \"%s\" nu a fost schimbat�\n"
+msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1055
-#, fuzzy, c-format
+#: g10/import.c:1056
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "key %08lX: cheie secret� cu cifru invalid %d - s�rit�\n"
+msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1066
-#, fuzzy
+#: g10/import.c:1067
 msgid "importing secret keys not allowed\n"
-msgstr "scriu cheia secret� �n `%s'\n"
+msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "nici un inel de chei secret implicit: %s\n"
+msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1094
-#, fuzzy, c-format
+#: g10/import.c:1095
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "cheia %08lX: cheie secret� importat�\n"
+msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1123
-#, fuzzy, c-format
+#: g10/import.c:1124
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "cheia %08lX: deja �n inelul de chei secret\n"
+msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1133
-#, fuzzy, c-format
+#: g10/import.c:1134
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "cheia %08lX: cheia secret� nu a fost g�sit�: %s\n"
+msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1163
-#, fuzzy, c-format
+#: g10/import.c:1164
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"cheia %08lX: nici o cheie public� - nu pot aplica certificatul de revocare\n"
+"cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1206
-#, fuzzy, c-format
+#: g10/import.c:1207
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "cheia %08lX: certificat de revocare invalid: %s - respins\n"
+msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1238
-#, fuzzy, c-format
+#: g10/import.c:1239
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "cheia %08lX: certificatul de revocare \"%s\" importat\n"
+msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1303
-#, fuzzy, c-format
+#: g10/import.c:1304
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "cheia %08lX: nici un ID utilizator pentru semn�tur�\n"
+msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1319
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
-"cheia %08lX: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%"
-"s\"\n"
+"cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
+"\"\n"
 
-#: g10/import.c:1320
-#, fuzzy, c-format
+#: g10/import.c:1321
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "cheia %08lX: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
+msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1338
-#, fuzzy, c-format
+#: g10/import.c:1339
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "cheia %08lX: nici o subcheie legat� de cheie\n"
+msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1349 g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1350 g10/import.c:1400
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "cheia %08lX: algoritm cu cheie public� nesuportat\n"
+msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1351
-#, fuzzy, c-format
+#: g10/import.c:1352
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "cheia %08lX: leg�tur� subcheie invalid�\n"
+msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1366
-#, fuzzy, c-format
+#: g10/import.c:1367
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "cheia %08lX: am �ters multiple leg�turi de subchei\n"
+msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1388
-#, fuzzy, c-format
+#: g10/import.c:1389
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "cheia %08lX: nici o subcheie pentru revocarea cheii\n"
+msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1401
-#, fuzzy, c-format
+#: g10/import.c:1402
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "cheia %08lX: revocare de subcheie invalid�\n"
+msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1416
-#, fuzzy, c-format
+#: g10/import.c:1417
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "cheia %08lX: am �ters multiple revoc�ri de subcheie\n"
+msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1458
-#, fuzzy, c-format
+#: g10/import.c:1459
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "cheia %08lX: am s�rit ID-ul utilizator '"
+msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1479
-#, fuzzy, c-format
+#: g10/import.c:1480
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "cheia %08lX: am s�rit subcheia\n"
+msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1506
-#, fuzzy, c-format
+#: g10/import.c:1507
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "cheia %08lX: semn�tura nu poate fi exportat� (clasa %02x) - s�rit�\n"
+msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1516
-#, fuzzy, c-format
+#: g10/import.c:1517
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "cheia %08lX: certificat de revocare �ntr-un loc gre�it - s�rit\n"
+msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1533
-#, fuzzy, c-format
+#: g10/import.c:1534
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "cheia %08lX: certificat de revocare invalid: %s - s�rit\n"
+msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1547
-#, fuzzy, c-format
+#: g10/import.c:1548
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "cheia %08lX: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
+msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1555
-#, fuzzy, c-format
+#: g10/import.c:1556
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "cheia %08lX: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
+msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
 #, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
+
+#: g10/import.c:1680
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "cheia %08lX: am detectat un ID utilizator duplicat - combinate\n"
+msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1717
-#, fuzzy, c-format
+#: g10/import.c:1742
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr ""
-"AVERTISMENT: cheia %08lX poate fi revocat�: aduc revocarea cheii %08lX\n"
+msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1731
-#, fuzzy, c-format
+#: g10/import.c:1756
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"AVERTISMENT: cheia %08lX poate fi revocat�: cheia de revocare %08lX nu este "
+"AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1790
-#, fuzzy, c-format
+#: g10/import.c:1815
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "cheia %08lX: am ad�ugat certificatul de revocare \"%s\"\n"
+msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1824
-#, fuzzy, c-format
+#: g10/import.c:1849
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "cheia %08lX: am ad�ugat semn�tura de cheie direct�\n"
+msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
+
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "cheia secret� deja stocat� pe un card\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "cheia secret� deja stocat� pe un card\n"
 
 #: g10/keydb.c:167
 #, c-format
@@ -2451,52 +2444,51 @@ msgstr "inelul de chei `%s' creat\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
-#, fuzzy
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2504,57 +2496,61 @@ msgid ""
 "etc.)\n"
 msgstr ""
 "V� rug�m decide�i c�t de mult� �ncredere ave�i �n acest utilizator\n"
-"pentru a verifica cheile altor utilizatori (privind la pa�apoarte,\n"
-"verific�nd amprentele din diferite surse...)?\n"
-"\n"
+"pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
+"verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
-#, fuzzy, c-format
+#: g10/keyedit.c:407 g10/pkclist.c:274
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = Am o �ncredere marginal�\n"
+msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/keyedit.c:408 g10/pkclist.c:276
+#, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = Am toat� �ncrederea\n"
+msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"V� rug�m s� introduce�i ad�ncimea acestei semn�turi de �ncredere.\n"
+"O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
+"semn�turi de �ncredere �n numele d-voastr�.\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
+"V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
+"ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2563,11 +2559,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2576,12 +2572,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2590,43 +2586,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
 
-#: g10/keyedit.c:748
-#, fuzzy, c-format
+#: g10/keyedit.c:749
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" a fost deja semnat� local de cheia %08lX\n"
+msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:751
-#, fuzzy, c-format
+#: g10/keyedit.c:752
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" a fost deja semnat� de cheia %08lX\n"
+msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
 
-#: g10/keyedit.c:778
-#, fuzzy, c-format
+#: g10/keyedit.c:779
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "Nimic de semnat cu cheia %08lX\n"
+msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2634,11 +2630,11 @@ msgstr ""
 "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
 "modul --pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2649,125 +2645,108 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
-#: g10/keyedit.c:894
-#, fuzzy
+#: g10/keyedit.c:895
 msgid "Your selection? (enter `?' for more information): "
-msgstr "Selec�ia dvs.? (introduce�i '?' pentru informa�ii suplimentare): "
+msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:918
-#, fuzzy, c-format
+#: g10/keyedit.c:919
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
-"aceast� cheie cu cheia d-voastr�: \""
+"aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:925
-#, fuzzy
+#: g10/keyedit.c:926
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"Aceasta va fi o auto-semn�tur�.\n"
+msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:931
-#, fuzzy
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
+msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:939
-#, fuzzy
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
+msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:949
-#, fuzzy
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"Semn�tura va fi marcat� ca non-exportabil�.\n"
+msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:956
-#, fuzzy
+#: g10/keyedit.c:957
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"Semn�tura va fi marcat� ca non-revocabil�.\n"
+msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:963
-#, fuzzy
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"Nu am verificat aceast� cheie deloc.\n"
+msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:968
-#, fuzzy
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"Am verificat aceast� cheie superficial.\n"
+msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:973
-#, fuzzy
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"Am verificat aceast� cheie foarte atent.\n"
+msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:983
-#, fuzzy
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
-msgstr "Dori�i cu adev�rat s� semna�i?"
+msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2775,11 +2754,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2787,373 +2766,406 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1135
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "Do you really want to do this? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� face�i acest lucru?"
+msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "selecteaz� cheie secundar� N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "enumer� semn�turi"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revoc� semn�turi"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "semneaz� cheia"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "semneaz� cheia local"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "�terge ID utilizator"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "adaug� o cheie secundar�"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "�terge o cheie secundar�"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "�terge semn�turi"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
+"selectate? (d/N) "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "schimb� data de expirare"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator ca primar"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "seteaz� lista de preferin�e"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "preferin�e actualizate"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
+"selectate? (d/N) "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
-msgstr "nu am putut interpreta URI pentru serverul de chei\n"
+msgid "set preferred keyserver URL for the selected user IDs"
+msgstr "seteaz� URL pentru serverul de chei preferat"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revoc� semn�turi"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr ""
+"Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "revoc� un ID utilizator"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revoc� o cheie secundar�"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "deactiveaz� o cheie"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "activeaz� o cheie"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "deactiveaz� o cheie"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "arat� o poz� ID"
 
-#: g10/keyedit.c:1386
-#, fuzzy, c-format
+#: g10/keyedit.c:1431
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "eroare la citire keyblock secret `%s': %s\n"
+msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1557
-#, fuzzy
+#: g10/keyedit.c:1610
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? "
+msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1568
-#, fuzzy, c-format
+#: g10/keyedit.c:1621
+#, c-format
 msgid "Unknown signature type `%s'\n"
-msgstr "clas� semn�turi necunoscut�"
+msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1617
-#, fuzzy
+#: g10/keyedit.c:1670
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? "
+msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1618
-#, fuzzy
+#: g10/keyedit.c:1671
 msgid "Really remove this user ID? (y/N) "
-msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
+msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1668
-#, fuzzy
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
-msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
+msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1680
-#, fuzzy
+#: g10/keyedit.c:1733
 msgid "You must select exactly one key.\n"
-msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
+msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1703
-#, fuzzy
+#: g10/keyedit.c:1756
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? "
+msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1704
-#, fuzzy
+#: g10/keyedit.c:1757
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? "
+msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:1739
-#, fuzzy
+#: g10/keyedit.c:1792
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? "
+msgstr ""
+"Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1740
-#, fuzzy
+#: g10/keyedit.c:1793
 msgid "Really revoke this user ID? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
+
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� revoca�i cheile selectate? "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgstr "Dori�i �ntr-adev�r s� revoca�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? "
+msgid "Do you really want to revoke this subkey? (y/N) "
+msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
+"�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
+"de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:1831
-#, fuzzy
+#: g10/keyedit.c:1897
 msgid "Set preference list to:\n"
-msgstr "seteaz� lista de preferin�e"
+msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:1837
-#, fuzzy
+#: g10/keyedit.c:1903
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
-"selectate? "
+"selectate? (d/N) "
 
-#: g10/keyedit.c:1839
-#, fuzzy
+#: g10/keyedit.c:1905
 msgid "Really update the preferences? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? "
+msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:1889
-#, fuzzy
+#: g10/keyedit.c:1955
 msgid "Save changes? (y/N) "
-msgstr "Salva�i schimb�rile? "
+msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:1892
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "Quit without saving? (y/N) "
-msgstr "Termina�i f�r� a salva? "
+msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
 #, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Aceast� cheie poate fi revocat� de cheia %s %s"
+
+#: g10/keyedit.c:2384
+#, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "Aceast� cheie poate fi revocat� de cheia %s "
+msgstr "Aceast� cheie poate fi revocat� de cheia %s %s"
 
-#: g10/keyedit.c:2315
-#, fuzzy
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
-#, fuzzy, c-format
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
+#, c-format
 msgid "created: %s"
-msgstr "nu pot crea %s: %s\n"
+msgstr "creat�: %s"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
-#, fuzzy, c-format
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
+#, c-format
 msgid "revoked: %s"
-msgstr "[revocat�] "
+msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
-#, fuzzy, c-format
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
+#, c-format
 msgid "expired: %s"
-msgstr " [expir�: %s]"
+msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
-#, fuzzy, c-format
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
+#, c-format
 msgid "expires: %s"
-msgstr " [expir�: %s]"
+msgstr "expir�: %s"
 
-#: g10/keyedit.c:2340
-#, fuzzy, c-format
+#: g10/keyedit.c:2415
+#, c-format
 msgid "usage: %s"
-msgstr " �ncredere: %c/%c"
+msgstr "folosire: %s"
 
-#: g10/keyedit.c:2355
-#, fuzzy, c-format
+#: g10/keyedit.c:2430
+#, c-format
 msgid "trust: %s"
-msgstr " �ncredere: %c/%c"
+msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "validitate: %s"
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
-msgstr ""
+msgstr "nr-card: "
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3161,19 +3173,18 @@ msgstr ""
 "V� rug�m observa�i c� validitatea cheii ar�tate nu este �n mod necesar\n"
 "corect� dac� nu reporni�i programul.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
-#, fuzzy
 msgid "revoked"
-msgstr "[revocat�] "
+msgstr "revocat�"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
-#, fuzzy
 msgid "expired"
-msgstr "expira"
+msgstr "expirat�"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3182,7 +3193,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3191,45 +3202,45 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "Am �ters %d semn�tur�.\n"
+msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3239,332 +3250,334 @@ msgstr ""
 "revocator          desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3029
-#, fuzzy
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
-msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
+msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3054
-#, fuzzy
+#: g10/keyedit.c:3129
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
-"Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i revocator "
-"desemnat? (d/N): "
+"Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
+"desemnat? (d/N) "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o cheie secundar�.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie secundar�.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie primar�.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
-#, fuzzy, c-format
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
+#, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "auto-semn�turi v3 s�rite pentru ID-ul utilizator \"%s\"\n"
+msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:3559
-#, fuzzy
+#: g10/keyedit.c:3635
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
+msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:3560
-#, fuzzy
+#: g10/keyedit.c:3636
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
+msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Nici o cheie secundar� cu indicele %d\n"
-
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3744
 #, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Nici un ID utilizator cu indicele %d\n"
+
+#: g10/keyedit.c:3861
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "ID utilizator: \""
+msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
-#, fuzzy, c-format
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   semnat� de %08lX la %s%s%s\n"
+msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:3829
-#, fuzzy, c-format
+#: g10/keyedit.c:3905
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "A�i semnat aceste ID-uri utilizator:\n"
+msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:3855
-#, fuzzy
+#: g10/keyedit.c:3931
 msgid " (non-revocable)"
-msgstr " (non-exportabil�)"
+msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:3862
-#, fuzzy, c-format
+#: g10/keyedit.c:3938
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   revocat de %08lX la %s\n"
+msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+
+#: g10/keyedit.c:4223
 #, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+
+#: g10/keyedit.c:4318
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n"
+msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 
 #: g10/keygen.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "preferin�a %c%lu duplicat�\n"
+msgstr "preferin�a `%s' duplicat�\n"
 
 #: g10/keygen.c:300
-#, fuzzy
 msgid "too many cipher preferences\n"
-msgstr "prea multe preferin�e `%c'\n"
+msgstr "prea multe preferin�e de cifrare\n"
 
 #: g10/keygen.c:302
-#, fuzzy
 msgid "too many digest preferences\n"
-msgstr "prea multe preferin�e `%c'\n"
+msgstr "prea multe preferin�e de rezumat\n"
 
 #: g10/keygen.c:304
-#, fuzzy
 msgid "too many compression preferences\n"
-msgstr "prea multe preferin�e `%c'\n"
+msgstr "prea multe preferin�e de compresie\n"
 
 #: g10/keygen.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "caracter invalid �n �ir preferin�e\n"
+msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1247
-#, fuzzy
+#: g10/keygen.c:1249
 msgid "Sign"
-msgstr "semneaz�"
+msgstr "Semneaz�"
 
-#: g10/keygen.c:1250
-#, fuzzy
+#: g10/keygen.c:1252
 msgid "Encrypt"
-msgstr "cifreaz� datele"
+msgstr "Cifreaz�"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
-msgstr ""
+msgstr "Autentific�"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1288
-#, fuzzy, c-format
+#: g10/keygen.c:1290
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (numai cifrare)\n"
+msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1350
-#, fuzzy, c-format
+#: g10/keygen.c:1352
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA �i ElGamal (implicit)\n"
+msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (numai semn�tur�)\n"
+msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1353
-#, fuzzy, c-format
+#: g10/keygen.c:1355
+#, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (numai cifrare)\n"
+msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1355
-#, fuzzy, c-format
+#: g10/keygen.c:1357
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (numai cifrare)\n"
+msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) RSA (numai semn�tur�)\n"
+msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1360
-#, fuzzy, c-format
+#: g10/keygen.c:1362
+#, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (numai cifrare)\n"
+msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
-#, fuzzy, c-format
+#: g10/keygen.c:1431 g10/keygen.c:2508
+#, c-format
 msgid "DSA keypair will have %u bits.\n"
-msgstr "Perechea de chei DSA va avea 1024 bi�i.\n"
+msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
-msgstr ""
+msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
 
-#: g10/keygen.c:1446
-#, fuzzy, c-format
+#: g10/keygen.c:1448
+#, c-format
 msgid "What keysize do you want? (%u) "
-msgstr "Ce lungime de cheie dori�i? (1024) "
+msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
+msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3580,7 +3593,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3596,29 +3609,39 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Semn�tura este valid� pentru? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s nu expir� deloc\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s nu expir� deloc\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s expir� la %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Semn�tura expir� %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3626,13 +3649,11 @@ msgstr ""
 "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
 "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
 
-#: g10/keygen.c:1589
-#, fuzzy
+#: g10/keygen.c:1595
 msgid "Is this correct? (y/N) "
-msgstr "Este aceasta corect (d/n)? "
+msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1632
-#, fuzzy
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3643,50 +3664,50 @@ msgid ""
 msgstr ""
 "\n"
 "Ave�i nevoie de un ID utilizator pentru a identifica cheia; software-ul\n"
-"construie�te id-ul utilizator din Numele Real, Comentariu �i Adresa de "
+"construie�te ID-ul utilizator din Numele Real, Comentariul �i Adresa de "
 "Email\n"
 "�n aceast� form�:\n"
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3697,27 +3718,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3725,12 +3746,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3741,7 +3762,7 @@ msgstr ""
 "O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
 "program cu op�iunea \"--edit-key\".\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3753,65 +3774,66 @@ msgstr ""
 "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
 "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
-#, fuzzy, c-format
+#: g10/keygen.c:2767 g10/keygen.c:2912
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "scriu cheia secret� �n `%s'\n"
+msgstr "scriu chitan�a cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "De notat c� aceast� cheie nu poate fi folosit� pentru cifrare.  Poate "
 "dori�i\n"
 "s� folosi�i comanda \"--edit-key\" pentru a genera o cheie secundar� pentru\n"
 "acest scop.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3819,7 +3841,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3827,114 +3849,114 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
-#, fuzzy
+#: g10/keygen.c:3077 g10/keygen.c:3201
 msgid "Really create? (y/N) "
-msgstr "Crea�i �ntr-adev�r? "
+msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3327
-#, fuzzy, c-format
+#: g10/keygen.c:3354
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "stergere keyblock a e�uat: %s\n"
+msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3374
-#, fuzzy, c-format
+#: g10/keygen.c:3401
+#, c-format
 msgid "can't create backup file `%s': %s\n"
-msgstr "nu pot crea `%s': %s\n"
+msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3397
-#, fuzzy, c-format
+#: g10/keygen.c:3424
+#, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "NOT�: cheia secret� %08lX a expirat la %s\n"
+msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
-msgstr ""
+msgstr "lungimea modulului RSA nu este %d\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgstr "exponent public prea lung (mai mult de 32 bi�i)\n"
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgstr "lungimea unui prim RSA nu este %d\n"
 
 #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
 msgid "never     "
-msgstr "niciodat�     "
+msgstr "niciodat� "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Politic� de semn�turi critic�: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Politic� de semn�turi: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "Server de chei preferat critic: "
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Notare semn�tur� critic�: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:729
-#, fuzzy, c-format
+#: g10/keylist.c:792
+#, c-format
 msgid "expired: %s)"
-msgstr " [expir�: %s]"
+msgstr "expirat: %s)"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
-#, fuzzy
+#: g10/keylist.c:1503 g10/keylist.c:1507
 msgid "      Key fingerprint ="
-msgstr "     Amprent� cheie ="
+msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "      Card nr. serie ="
 
 #: g10/keyring.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "punerea armurii a e�uat: %s\n"
+msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
 #: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -3955,19 +3977,19 @@ msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
 #: g10/keyring.c:1375
-#, fuzzy, c-format
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "verific inelul de chei `%s'\n"
+msgstr "pun �n cache inelul de chei `%s'\n"
 
 #: g10/keyring.c:1421
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu chei verificate (%lu semn�turi)\n"
+msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
 
 #: g10/keyring.c:1433
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu chei verificate (%lu semn�turi)\n"
+msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 
 #: g10/keyring.c:1504
 #, c-format
@@ -3975,138 +3997,135 @@ msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
 
 #: g10/keyserver.c:98
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
-"AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
+"AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
+"platform�\n"
 
-#: g10/keyserver.c:378
-#, fuzzy
+#: g10/keyserver.c:425
 msgid "disabled"
-msgstr "deact"
+msgstr "deactivat(�)"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
-#, fuzzy, c-format
+#: g10/keyserver.c:709 g10/keyserver.c:1229
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "op�iuni export invalide\n"
+msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:752
-#, fuzzy, c-format
+#: g10/keyserver.c:799
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "cheia `%s' nu a fost g�sit�: %s\n"
+msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:754
-#, fuzzy
+#: g10/keyserver.c:801
 msgid "key not found on keyserver\n"
-msgstr "cheia `%s' nu a fost g�sit�: %s\n"
+msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:901
-#, fuzzy, c-format
+#: g10/keyserver.c:976
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "cer cheia %08lX de la %s\n"
+msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:905
-#, fuzzy, c-format
+#: g10/keyserver.c:980
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "cer cheia %08lX de la %s\n"
+msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1050
-#, fuzzy, c-format
+#: g10/keyserver.c:1132
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
+msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1054
-#, fuzzy, c-format
+#: g10/keyserver.c:1136
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"semnat� cu cheie d-voastr� %08lX la %s\n"
+msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1097
-#, fuzzy, c-format
+#: g10/keyserver.c:1179
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
+msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1100
-#, fuzzy, c-format
+#: g10/keyserver.c:1182
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
+msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
-#, fuzzy
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 msgid "no keyserver action!\n"
-msgstr "op�iuni export invalide\n"
+msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
+"AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
+"s)\n"
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
+"apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr ""
+msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+msgstr "gpgkeys_%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1261
-#, fuzzy
+#: g10/keyserver.c:1342
 msgid "keyserver timed out\n"
-msgstr "eroare server de chei"
+msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1266
-#, fuzzy
+#: g10/keyserver.c:1347
 msgid "keyserver internal error\n"
-msgstr "eroare server de chei"
+msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1275
-#, fuzzy, c-format
+#: g10/keyserver.c:1356
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "recep�ie server de chei e�uat�: %s\n"
+msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1585
-#, fuzzy, c-format
+#: g10/keyserver.c:1666
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
+msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1607
-#, fuzzy, c-format
+#: g10/keyserver.c:1688
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "cer cheia %08lX de la %s\n"
+msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1609
-#, fuzzy, c-format
+#: g10/keyserver.c:1690
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "cer cheia %08lX de la %s\n"
+msgstr "reactualizez %d chei de la %s\n"
 
 #: g10/mainproc.c:248
 #, c-format
@@ -4124,33 +4143,33 @@ msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "cifrat cu un algoritm necunoscut %d\n"
+msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
 #: g10/mainproc.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "public key is %s\n"
-msgstr "cheia public� este %08lX\n"
+msgstr "cheia public� este %s\n"
 
 #: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
 #: g10/mainproc.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "cifrat cu cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s\n"
+msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
 #: g10/mainproc.c:465 g10/pkclist.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                aka \""
+msgstr "      \"%s\"\n"
 
 #: g10/mainproc.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "cifrat cu cheia %s, ID %08lX\n"
+msgstr "cifrat cu cheia %s, ID %s\n"
 
 #: g10/mainproc.c:483
 #, c-format
@@ -4215,47 +4234,47 @@ msgid "can't handle these multiple signatures\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
 #: g10/mainproc.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s\n"
-msgstr "Semn�tur� expirat� %s\n"
+msgstr "Semn�tur� f�cut� %s\n"
 
 #: g10/mainproc.c:1351
-#, fuzzy, c-format
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                aka \""
+msgstr "               folosind cheia %s %s\n"
 
 #: g10/mainproc.c:1355
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "Semn�tur� f�cut� %.*s folosind cheia %s cu ID %08lX\n"
+msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
 #: g10/mainproc.c:1375
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
 #: g10/mainproc.c:1480 g10/mainproc.c:1528
-#, fuzzy, c-format
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "Semn�tur� INCORECT� din \""
+msgstr "Semn�tur� INCORECT� din \"%s\""
 
 #: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Semn�tur� expirat� din \""
+msgstr "Semn�tur� expirat� din \"%s\""
 
 #: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Semn�tur� bun� din \""
+msgstr "Semn�tur� bun� din \"%s\""
 
 #: g10/mainproc.c:1536
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
 #: g10/mainproc.c:1568
-#, fuzzy, c-format
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                aka \""
+msgstr "                aka \"%s\""
 
 #: g10/mainproc.c:1662
 #, c-format
@@ -4302,7 +4321,7 @@ msgstr ""
 #: g10/mainproc.c:1811
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "semn�tur� standalone de clas� 0x%02x\n"
+msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
 #: g10/mainproc.c:1868
 msgid "old style (PGP 2.x) signature\n"
@@ -4312,91 +4331,90 @@ msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
-#, fuzzy, c-format
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "nu pot deschide fi�ierul: %s\n"
+msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: g10/misc.c:190
-#, fuzzy, c-format
+#: g10/misc.c:204
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
+msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: g10/misc.c:299
-#, fuzzy, c-format
+#: g10/misc.c:313
+#, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
+msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
 
-#: g10/misc.c:314
-#, fuzzy, c-format
+#: g10/misc.c:328
+#, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "algoritm cifrare neimplementat"
+msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:329
-#, fuzzy, c-format
+#: g10/misc.c:343
+#, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "semn�tur� %s, algoritm rezumat %s\n"
+msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:334
-#, fuzzy, c-format
+#: g10/misc.c:348
+#, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr ""
-"for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
+msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "plugin-ul cu cifrul IDEA nu este prezent\n"
+msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "vede�i http://www.gnupg.org/why-not-idea.html pentru informa�ii "
 "suplimentare\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Necompresat"
 
-#: g10/misc.c:706
-#, fuzzy
+#
+#: g10/misc.c:720
 msgid "uncompressed|none"
-msgstr "Necompresat"
+msgstr "necompresat|niciunul"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:973
-#, fuzzy, c-format
+#: g10/misc.c:987
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "citesc op�iuni din `%s'\n"
+msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:998
-#, fuzzy, c-format
+#: g10/misc.c:1012
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "destinatar implicit necunoscut `%s'\n"
+msgstr "op�iune necunoscut� `%s'\n"
 
 #: g10/openfile.c:84
 #, c-format
@@ -4404,9 +4422,8 @@ msgid "File `%s' exists. "
 msgstr "Fi�ierul `%s' exist�. "
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "Suprascriu (d/N)? "
+msgstr "Suprascriu? (d/N) "
 
 #: g10/openfile.c:119
 #, c-format
@@ -4438,22 +4455,22 @@ msgstr ""
 "AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
 
 #: g10/openfile.c:409
-#, fuzzy, c-format
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: director creat\n"
+msgstr "director `%s' creat\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -4492,80 +4509,79 @@ msgstr "nu m� pot conecta la `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
-#, fuzzy, c-format
+#: g10/passphrase.c:699 g10/passphrase.c:1205
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (ID cheie principal� %08lX)"
+msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:714
-#, fuzzy, c-format
+#: g10/passphrase.c:713
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
-"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru "
+"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pt. "
 "utilizator:\n"
 "\"%.*s\"\n"
-"%u-bit cheia %s, ID %08lX, creat� %s%s\n"
+"cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "r�spuns invalid de la agent\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
+#
 #: g10/passphrase.c:1096 g10/passphrase.c:1258
-#, fuzzy
 msgid "can't query passphrase in batch mode\n"
-msgstr "nu pot cere parola �n modul batch\n"
+msgstr "nu pot cere fraza-parol� �n modul batch\n"
 
 #: g10/passphrase.c:1103 g10/passphrase.c:1263
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
 #: g10/passphrase.c:1186
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
-"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia\n"
-"secret� pentru utilizator: \""
+"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
+"utilizator: \"%s\"\n"
 
 #: g10/passphrase.c:1192
-#, fuzzy, c-format
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s"
+msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
 #: g10/passphrase.c:1201
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "         (subcheie pe cheia principal� ID %s)"
 
 #: g10/passphrase.c:1267
 msgid "Repeat passphrase: "
@@ -4592,24 +4608,23 @@ msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
 
 #: g10/photoid.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "nu pot deschide fi�ierul: %s\n"
+msgstr "nu pot deschide fi�ierul JPEG `%s': %s\n"
 
 #: g10/photoid.c:102
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "Acest JPEG este foarte mare (%d octe�i) !\n"
 
 #: g10/photoid.c:104
-#, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
+msgstr "Sunte�i sigur(�) c� dori�i s� �l folosi�i? (d/N) "
 
 #: g10/photoid.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "\"%s\" nu este un fi�ier JPEG\n"
+msgstr "`%s' nu este un fi�ier JPEG\n"
 
 #: g10/photoid.c:136
 msgid "Is this photo correct (y/N/q)? "
@@ -4652,52 +4667,47 @@ msgid "iImMqQsS"
 msgstr "iImMtTsS"
 
 #: g10/pkclist.c:213
-#, fuzzy
 msgid "No trust value assigned to:\n"
-msgstr ""
-"Nici o valoare de �ncredere atribuit� lui:\n"
-"%4u%c/%08lX %s \""
+msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
 
 #: g10/pkclist.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                aka \""
+msgstr "  aka \"%s\"\n"
 
 #: g10/pkclist.c:255
-#, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Aceast� cheie apar�ine probabil proprietarului\n"
+msgstr ""
+"C�t de mult crede�i c� aceast� cheie apar�ine �ntr-adev�r utilizatorului "
+"numit?\n"
 
 #: g10/pkclist.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = Nu �tiu\n"
+msgstr "  %d = Nu �tiu sau nu vreau s� m� pronun�\n"
 
 #: g10/pkclist.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = NU am �ncredere\n"
+msgstr "  %d = NU am �ncredere\n"
 
 #: g10/pkclist.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = Am �ncredere suprem�\n"
+msgstr "  %d = Am �ncredere suprem�\n"
 
 #: g10/pkclist.c:284
-#, fuzzy
 msgid "  m = back to the main menu\n"
-msgstr " m = �napoi la meniul principal\n"
+msgstr "  m = �napoi la meniul principal\n"
 
 #: g10/pkclist.c:287
-#, fuzzy
 msgid "  s = skip this key\n"
-msgstr " s = s�ri peste cheia asta\n"
+msgstr "  s = s�ri peste cheia asta\n"
 
 #: g10/pkclist.c:288
-#, fuzzy
 msgid "  q = quit\n"
-msgstr " t = termin�\n"
+msgstr "  t = termin�\n"
 
 #: g10/pkclist.c:292
 #, c-format
@@ -4705,59 +4715,57 @@ msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
+"\n"
 
 #: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
 #: g10/pkclist.c:319
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? "
+msgstr ""
+"Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? (d/N) "
 
 #: g10/pkclist.c:333
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
 
 #: g10/pkclist.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
-"proprietarului\n"
+"%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
+"utilizatorului numit\n"
 
 #: g10/pkclist.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
-"proprietarului\n"
+"%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
+"utilizatorului numit\n"
 
 #: g10/pkclist.c:429
-#, fuzzy
 msgid "This key probably belongs to the named user\n"
-msgstr "Aceast� cheie apar�ine probabil proprietarului\n"
+msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
 
 #: g10/pkclist.c:434
 msgid "This key belongs to us\n"
 msgstr "Aceast� cheie ne apar�ine\n"
 
 #: g10/pkclist.c:460
-#, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
-"NU este sigur c� cheie apar�ine persoanei numite �n ID-ul\n"
+"NU este sigur c� cheia apar�ine persoanei numite �n ID-ul\n"
 "utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
-"r�spunde cu da la urm�toarea �ntrebare\n"
-"\n"
+"r�spunde cu da la urm�toarea �ntrebare.\n"
 
 #: g10/pkclist.c:467
-#, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "Folosi�i oricum aceast� cheie? "
+msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
 #: g10/pkclist.c:501
 msgid "WARNING: Using untrusted key!\n"
@@ -4778,7 +4786,6 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
 #: g10/pkclist.c:521
-#, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
 
@@ -4840,7 +4847,7 @@ msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Destinatari curen�i:\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -4867,9 +4874,9 @@ msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
 #: g10/pkclist.c:903
-#, fuzzy, c-format
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "destinatar implicit necunoscut `%s'\n"
+msgstr "destinatar implicit necunoscut \"%s\"\n"
 
 #: g10/pkclist.c:948
 #, c-format
@@ -4912,9 +4919,9 @@ msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
 #: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "destinator anonim; �ncerc cheia secret� %08lX ...\n"
+msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
 
 #: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
@@ -4930,14 +4937,16 @@ msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
 
 #: g10/pubkey-enc.c:266
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "NOT�: algoritm cifrare %d nu a fost g�sit �n preferin�e\n"
+msgstr ""
+"AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
+"destinatarului\n"
 
 #: g10/pubkey-enc.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %s expired at %s\n"
-msgstr "NOT�: cheia secret� %08lX a expirat la %s\n"
+msgstr "NOT�: cheia secret� %s a expirat la %s\n"
 
 #: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
@@ -4950,9 +4959,9 @@ msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
 
 #: g10/revoke.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "cheia %08lX: nici un ID utilizator\n"
+msgstr "cheia %s nu are nici un ID utilizator\n"
 
 #: g10/revoke.c:272
 msgid "To be revoked by:\n"
@@ -4963,9 +4972,8 @@ msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
 
 #: g10/revoke.c:280
-#, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Crea�i un certificat de revocare pentru aceast� cheie? "
+msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
 
 #: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
@@ -4981,14 +4989,14 @@ msgid "Revocation certificate created.\n"
 msgstr "Certificat de revocare creat.\n"
 
 #: g10/revoke.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "nici o cheie de revocare g�sit� pentru `%s'\n"
+msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
 #: g10/revoke.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "cheia secret� `%s' nu a fost g�sit�: %s\n"
+msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
 #: g10/revoke.c:461
 #, c-format
@@ -5000,9 +5008,8 @@ msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
 #: g10/revoke.c:479
-#, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Crea�i un certificat de revocare pentru aceast� cheie? "
+msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
 
 #: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
@@ -5057,9 +5064,8 @@ msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
 #: g10/revoke.c:680
-#, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "Este aceasta OK? "
+msgstr "Este aceasta OK? (d/N) "
 
 #: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
@@ -5071,26 +5077,26 @@ msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritm de protec�ie %d%s nu este suportat\n"
 
 #: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Fraz�-parol� invalid�; v� rug�m mai �ncerca�i o dat�"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTISMENT: Cheie slab� detectat� - v� rug�m schimba�i din nou fraza-"
 "parol�.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generez �nvechitul checksum de 16-bit pentru protec�ia cheii secrete\n"
 
@@ -5112,66 +5118,66 @@ msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
 
 #: g10/sig-check.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
-"AVERTISMENT: subcheia de semnare %08lX nu este certificat� reciproc (cross-"
+"AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
 #: g10/sig-check.c:102
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"AVERTISMENT: subcheia de semnare %08lX are un certificare-reciproc� invalid� "
+"AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
 "(invalid cross-certification)\n"
 
 #: g10/sig-check.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr "cheie public� %08lX este mai nou� cu %lu secund� dec�t semn�tura\n"
+msgstr "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
 
 #: g10/sig-check.c:169
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr "cheie public� %08lX este mai nou� cu %lu secunde dec�t semn�tura\n"
+msgstr "cheie public� %s este mai nou� cu %lu secunde dec�t semn�tura\n"
 
 #: g10/sig-check.c:180
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
-"cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+"cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
 #: g10/sig-check.c:182
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
-"cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
+"cheia %s a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
 #: g10/sig-check.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "NOT�: cheia semn�turii %08lX a expirat %s\n"
+msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
 
 #: g10/sig-check.c:275
-#, fuzzy, c-format
+#, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"presupun semn�tur� incorect� din cheia %08lX datorit� unui bit critic "
+"presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
 "necunoscut\n"
 
 #: g10/sig-check.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "cheia %08lX: nici o subcheie pentru pachetul de revocare a subcheii\n"
+msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 
 #: g10/sig-check.c:558
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "cheia %08lX: nici o subcheie pentru semnare legat� de cheie\n"
+msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
 
 #: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
@@ -5197,21 +5203,21 @@ msgstr ""
 "nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
 
 #: g10/sign.c:159
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"AVERTISMENT: nu pot %%-expanda url-ul de politic� (prea mare).  Folosesc "
+"AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
 "neexpandat.\n"
 
 #: g10/sign.c:187
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"AVERTISMENT: nu pot %%-expanda url-ul de politic� (prea mare).  Folosesc "
-"neexpandat.\n"
+"AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
+"folosesc neexpandat.\n"
 
 #: g10/sign.c:364
 #, c-format
@@ -5219,20 +5225,21 @@ msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
 #: g10/sign.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s semn�tur� de la: \"%s\"\n"
+msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
 #: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
 #: g10/sign.c:808
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
+"AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
+"destinatarului\n"
 
 #: g10/sign.c:900
 msgid "signing:"
@@ -5252,25 +5259,24 @@ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
 
 #: g10/skclist.c:157
-#, fuzzy, c-format
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "s�rit� `%s': duplicat�\n"
+msgstr "s�rit� \"%s\": duplicat�\n"
 
 #: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "s�rit� `%s': %s\n"
+msgstr "s�rit� \"%s\": %s\n"
 
 #: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
 #: g10/skclist.c:185
-#, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"s�rit� `%s': aceasta este o cheie ElGamal generat� de PGP care nu e sigur� "
-"pentru semn�turi!\n"
+"aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
+"semn�turi!"
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
 #, c-format
@@ -5287,38 +5293,35 @@ msgstr ""
 "# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
 
 #: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "error in `%s': %s\n"
-msgstr "eroare la citire `%s': %s\n"
+msgstr "eroare �n `%s': %s\n"
 
 #: g10/tdbdump.c:159
-#, fuzzy
 msgid "line too long"
-msgstr "linie prea lung�\n"
+msgstr "linie prea lung�"
 
 #: g10/tdbdump.c:167
 msgid "colon missing"
-msgstr ""
+msgstr "caracter : lips�"
 
 #: g10/tdbdump.c:173
-#, fuzzy
 msgid "invalid fingerprint"
-msgstr "eroare: amprent� invalid�\n"
+msgstr "amprent� invalid�"
 
 #: g10/tdbdump.c:178
-#, fuzzy
 msgid "ownertrust value missing"
-msgstr "import� valorile �ncrederii �n proprietari"
+msgstr "lipse�te valorea �ncrederii �n proprietari (ownertrust)"
 
 #: g10/tdbdump.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "eroare g�sire �nregistrare �ncredere: %s\n"
+msgstr "eroare g�sire �nregistrare �ncredere �n `%s': %s\n"
 
 #: g10/tdbdump.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "eroare citire: %s\n"
+msgstr "eroare citire �n `%s': %s\n"
 
 #: g10/tdbdump.c:227 g10/trustdb.c:380
 #, c-format
@@ -5340,9 +5343,9 @@ msgid "trustdb transaction too large\n"
 msgstr "tranzac�ia trustdb prea mare\n"
 
 #: g10/tdbio.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "nu pot �nchide `%s': %s\n"
+msgstr "nu pot accesa `%s': %s\n"
 
 #: g10/tdbio.c:512
 #, c-format
@@ -5350,14 +5353,14 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu exist�!\n"
 
 #: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
-#, fuzzy, c-format
+#, c-format
 msgid "can't create lock for `%s'\n"
-msgstr "nu pot crea `%s': %s\n"
+msgstr "nu pot crea �ncuietoare (lock) pentru `%s'\n"
 
 #: g10/tdbio.c:524 g10/tdbio.c:591
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock `%s'\n"
-msgstr "nu pot deschide `%s'\n"
+msgstr "nu pot �ncuia (lock) `%s'\n"
 
 #: g10/tdbio.c:550
 #, c-format
@@ -5453,12 +5456,12 @@ msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
@@ -5469,24 +5472,24 @@ msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
 
 #: g10/trustdb.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "cheia %08lX: acceptat� ca cheie valid�\n"
+msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
 
 #: g10/trustdb.c:295
-#, fuzzy, c-format
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "cheia %08lX apare de mai multe ori �n trustdb\n"
+msgstr "cheia %s apare de mai multe ori �n trustdb\n"
 
 #: g10/trustdb.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "cheia %08lX: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
+msgstr "cheia %s: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
 
 #: g10/trustdb.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "cheie marcat� ca av�nd �ncredere suprem�.\n"
+msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
 
 #: g10/trustdb.c:344
 #, c-format
@@ -5502,91 +5505,88 @@ msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
+"nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
 
 #: g10/trustdb.c:452
 #, c-format
 msgid "using %s trust model\n"
-msgstr ""
+msgstr "folosesc model de �ncredere %s\n"
 
 #: g10/trustdb.c:504
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-msgstr ""
+msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
 
 #: g10/trustdb.c:506
-#, fuzzy
 msgid "[ revoked]"
-msgstr "[revocat�] "
+msgstr "[revocat�]"
 
 #: g10/trustdb.c:508 g10/trustdb.c:513
-#, fuzzy
 msgid "[ expired]"
 msgstr "[expirat�] "
 
 #: g10/trustdb.c:512
-#, fuzzy
 msgid "[ unknown]"
-msgstr "necunoscut"
+msgstr "[necunoscut�]"
 
 #: g10/trustdb.c:514
 msgid "[  undef ]"
-msgstr ""
+msgstr "[  nedef ]"
 
 #: g10/trustdb.c:515
 msgid "[marginal]"
-msgstr ""
+msgstr "[marginal]"
 
 #: g10/trustdb.c:516
 msgid "[  full  ]"
-msgstr ""
+msgstr "[ deplin�]"
 
 #: g10/trustdb.c:517
 msgid "[ultimate]"
-msgstr ""
+msgstr "[ suprem�]"
 
 #: g10/trustdb.c:532
 msgid "undefined"
-msgstr ""
+msgstr "nedefinit�"
 
 #: g10/trustdb.c:533
-#, fuzzy
 msgid "never"
-msgstr "niciodat�     "
+msgstr "niciodat�"
 
 #: g10/trustdb.c:534
 msgid "marginal"
-msgstr ""
+msgstr "marginal"
 
 #: g10/trustdb.c:535
 msgid "full"
-msgstr ""
+msgstr "deplin�"
 
 #: g10/trustdb.c:536
 msgid "ultimate"
-msgstr ""
+msgstr "suprem�"
 
 #: g10/trustdb.c:576
 msgid "no need for a trustdb check\n"
-msgstr "nu e nevoie de o verificare pentru trustdb\n"
+msgstr "nu e nevoie de o verificare trustdb\n"
 
 #: g10/trustdb.c:582 g10/trustdb.c:2143
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "urm�toarea verificare pentru trustdb programat� pe %s\n"
+msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
 #: g10/trustdb.c:591
-#, fuzzy, c-format
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "nu e nevoie de o verificare pentru trustdb\n"
+msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
 
 #: g10/trustdb.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "nu e nevoie de o verificare pentru trustdb\n"
+msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
 #: g10/trustdb.c:824 g10/trustdb.c:1262
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "cheia public� %08lX nu a fost g�sit�: %s\n"
+msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
 #: g10/trustdb.c:1019
 msgid "please do a --check-trustdb\n"
@@ -5606,25 +5606,28 @@ msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
 #: g10/trustdb.c:1965
-#, fuzzy, c-format
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "cheia public� a cheii cu �ncredere suprem� %08lX nu a fost g�sit�\n"
+msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
 #: g10/trustdb.c:1988
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
+"%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
 #: g10/trustdb.c:2074
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
 #: g10/trustdb.c:2149
-#, fuzzy, c-format
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
+msgstr ""
+"nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
 
 #: g10/verify.c:116
 msgid ""
@@ -5850,22 +5853,20 @@ msgid "keyserver error"
 msgstr "eroare server de chei"
 
 #: util/errors.c:108
-#, fuzzy
 msgid "canceled"
-msgstr "Renun��"
+msgstr "anulat�"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no card"
-msgstr "necifrat"
+msgstr "nici un card"
 
 #: util/logger.c:157
 msgid "ERROR: "
-msgstr ""
+msgstr "EROARE: "
 
 #: util/logger.c:160
 msgid "WARNING: "
-msgstr ""
+msgstr "AVERTISMENT: "
 
 #: util/logger.c:223
 #, c-format
@@ -5903,20 +5904,19 @@ msgstr "tT"
 
 #: util/miscutil.c:384
 msgid "okay|okay"
-msgstr ""
+msgstr "OK|OK"
 
 #: util/miscutil.c:386
 msgid "cancel|cancel"
-msgstr ""
+msgstr "renun��|renun��"
 
 #: util/miscutil.c:387
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
 #: util/miscutil.c:388
-#, fuzzy
 msgid "cC"
-msgstr "c"
+msgstr "cC"
 
 #: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
@@ -5935,15 +5935,41 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "selecteaz� cheie secundar� N"
+
+#~ msgid "list signatures"
+#~ msgstr "enumer� semn�turi"
+
+#~ msgid "sign the key"
+#~ msgstr "semneaz� cheia"
+
+#~ msgid "add a secondary key"
+#~ msgstr "adaug� o cheie secundar�"
+
+#~ msgid "delete signatures"
+#~ msgstr "�terge semn�turi"
+
+#~ msgid "change the expire date"
+#~ msgstr "schimb� data de expirare"
+
+#~ msgid "set preference list"
+#~ msgstr "seteaz� lista de preferin�e"
+
+#~ msgid "updated preferences"
+#~ msgstr "preferin�e actualizate"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Nici o cheie secundar� cu indicele %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key id-utilizator"
 
 #~ msgid "--nrlsign-key user-id"
 #~ msgstr "--nrlsign-key id-utilizator"
 
-#, fuzzy
 #~ msgid "make a trust signature"
-#~ msgstr "creaz� o semn�tur� deta�at�"
+#~ msgstr "creaz� o semn�tur� de �ncredere"
 
 #~ msgid "sign the key non-revocably"
 #~ msgstr "semneaz� cheia irevocabil"
@@ -5966,25 +5992,20 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "debug"
 #~ msgstr "depanare"
 
-#, fuzzy
 #~ msgid "name"
-#~ msgstr "activ"
+#~ msgstr "nume"
 
-#, fuzzy
 #~ msgid "login"
-#~ msgstr "semloc"
+#~ msgstr "login"
 
-#, fuzzy
 #~ msgid "cafpr"
-#~ msgstr "ampr"
+#~ msgstr "cafpr"
 
-#, fuzzy
 #~ msgid "forcesig"
-#~ msgstr "revsem"
+#~ msgstr "forcesig"
 
-#, fuzzy
 #~ msgid "generate"
-#~ msgstr "eroare general�"
+#~ msgstr "genereaz�"
 
 #~ msgid "passwd"
 #~ msgstr "parola"
@@ -6013,37 +6034,32 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "s"
 #~ msgstr "s"
 
-#, fuzzy
 #~ msgid "tsign"
-#~ msgstr "semneaz�"
+#~ msgstr "tsign"
 
 #~ msgid "lsign"
-#~ msgstr "semloc"
+#~ msgstr "lsign"
 
 #~ msgid "nrsign"
-#~ msgstr "semirev"
+#~ msgstr "nrsign"
 
 #~ msgid "nrlsign"
-#~ msgstr "semlirev"
+#~ msgstr "nrlsign"
 
 #~ msgid "adduid"
-#~ msgstr "adauid"
+#~ msgstr "adduid"
 
 #~ msgid "addphoto"
-#~ msgstr "adapoza"
+#~ msgstr "addphoto"
 
 #~ msgid "deluid"
-#~ msgstr "steuid"
+#~ msgstr "deluid"
 
 #~ msgid "delphoto"
-#~ msgstr "stepoza"
+#~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "adacheie"
-
-#, fuzzy
 #~ msgid "addcardkey"
-#~ msgstr "adacheie"
+#~ msgstr "addcardkey"
 
 #~ msgid "delkey"
 #~ msgstr "stecheie"
@@ -6070,20 +6086,19 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgstr "pref"
 
 #~ msgid "showpref"
-#~ msgstr "afispref"
+#~ msgstr "showpref"
 
 #~ msgid "setpref"
 #~ msgstr "setpref"
 
 #~ msgid "updpref"
-#~ msgstr "actpref"
+#~ msgstr "updpref"
 
-#, fuzzy
 #~ msgid "keyserver"
-#~ msgstr "eroare server de chei"
+#~ msgstr "server de chei"
 
 #~ msgid "trust"
-#~ msgstr "incred"
+#~ msgstr "�ncredere"
 
 #~ msgid "revsig"
 #~ msgstr "revsem"
@@ -6092,16 +6107,16 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgstr "revuid"
 
 #~ msgid "revkey"
-#~ msgstr "revcheie"
+#~ msgstr "revkey"
 
 #~ msgid "disable"
-#~ msgstr "deact"
+#~ msgstr "deactiveaz�"
 
 #~ msgid "enable"
-#~ msgstr "activ"
+#~ msgstr "activeaz�"
 
 #~ msgid "showphoto"
-#~ msgstr "afispoza"
+#~ msgstr "showphoto"
 
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\n"
@@ -6138,9 +6153,8 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ "Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n"
 #~ "deoarece calculele iau FOARTE MULT timp!\n"
 
-#, fuzzy
 #~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie?"
+#~ msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie? (d/N) "
 
 #~ msgid ""
 #~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
@@ -6158,9 +6172,8 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ "acest algoritm de cifrare este �nvechit; v� rug�m folosi�i unul "
 #~ "standard!\n"
 
-#, fuzzy
 #~ msgid "writing to file `%s'\n"
-#~ msgstr "scriu �n `%s'\n"
+#~ msgstr "scriu �n fi�ierul `%s'\n"
 
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
@@ -6168,17 +6181,14 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "key `%s' not found: %s\n"
 #~ msgstr "cheia `%s' nu a fost g�sit�: %s\n"
 
-#, fuzzy
 #~ msgid "can't create file `%s': %s\n"
-#~ msgstr "nu pot crea `%s': %s\n"
+#~ msgstr "nu pot crea fi�ierul `%s': %s\n"
 
-#, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "nu pot deschide fi�ierul: %s\n"
 
-#, fuzzy
 #~ msgid "          \""
-#~ msgstr "                aka \""
+#~ msgstr "          \""
 
 #~ msgid " i = please show me more information\n"
 #~ msgstr " i = arat�-mi mai multe informa�ii\n"
@@ -6196,23 +6206,19 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgstr "%08lX: Noi NU avem �ncredere �n acest� cheie\n"
 
 #~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (semn�tur� �i cifrare)\n"
+#~ msgstr "   (%d) RSA (semnare �i cifrare)\n"
 
-#, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (numai semn�tur�)\n"
+#~ msgstr "   (%d) RSA (numai autentificare)\n"
 
-#, fuzzy
 #~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (semn�tur� �i cifrare)\n"
+#~ msgstr "   (%d) RSA (semnare �i autentificare)\n"
 
-#, fuzzy
 #~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (numai cifrare)\n"
+#~ msgstr "   (%d) RSA (cifrare �i autentificare)\n"
 
-#, fuzzy
 #~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (semn�tur� �i cifrare)\n"
+#~ msgstr "   (%d) RSA (semnare, cifrare �i autentificare)\n"
 
 #~ msgid "%s: can't open: %s\n"
 #~ msgstr "%s: nu pot deschide: %s\n"
@@ -6223,29 +6229,24 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "can't open %s: %s\n"
 #~ msgstr "nu pot deschide %s: %s\n"
 
-#, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = Am o �ncredere marginal�\n"
+#~ msgstr "   (%d) Am o �ncredere marginal�\n"
 
-#, fuzzy
 #~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = Am toat� �ncrederea\n"
+#~ msgstr "   (%d) Am toat� �ncrederea\n"
 
-#, fuzzy
 #~ msgid "expires"
 #~ msgstr "expira"
 
-#, fuzzy
 #~ msgid ""
 #~ "\"\n"
 #~ "locally signed with your key %s at %s\n"
 #~ msgstr ""
 #~ "\"\n"
-#~ "semnat� local cu cheie d-voastr� %08lX la %s\n"
+#~ "semnat� local cu cheie d-voastr� %s la %s\n"
 
-#, fuzzy
 #~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   semnat� de %08lX la %s%s\n"
+#~ msgstr "   semnat� de %s la %s%s\n"
 
 #~ msgid "%s: can't access: %s\n"
 #~ msgstr "%s: nu pot accesa: %s\n"
@@ -6290,16 +6291,14 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? probleme la verificare revoc�rii: %s\n"
 
-#, fuzzy
 #~ msgid " [expired: %s]"
-#~ msgstr " [expir�: %s]"
+#~ msgstr " [expirat�: %s]"
 
 #~ msgid " [expires: %s]"
 #~ msgstr " [expir�: %s]"
 
-#, fuzzy
 #~ msgid " [revoked: %s]"
-#~ msgstr "[revocat�] "
+#~ msgstr "[revocat�: %s] "
 
 #~ msgid "can't create %s: %s\n"
 #~ msgstr "nu pot crea %s: %s\n"
diff --git a/po/ru.po b/po/ru.po
index 626c6b732..4eb8cc5d0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2003-12-23 19:24+0100\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -29,9 +29,9 @@ msgstr "не могу создать главное число меньшее %d
 msgid "no entropy gathering module detected\n"
 msgstr "не найден модуль накопления энтропии\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -67,8 +67,8 @@ msgstr "не могу прочитать `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -124,146 +124,149 @@ msgstr ""
 "Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\n"
 "чтобы ОС могла получить большую энтропию! (Необходимо еще %d байт)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "ошибка чтения блока ключей: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "создать новую пару ключей"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "сбой при удалении блока ключа: %s\n"
@@ -298,7 +301,7 @@ msgstr "неожиданный формат ASCII:"
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02x пропущен\n"
@@ -315,7 +318,7 @@ msgstr "преждевременный конец файла (eof) (в CRC)\n"
 msgid "malformed CRC\n"
 msgstr "плохо сформированный CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка контрольной суммы CRC; %06lx - %06lx\n"
@@ -329,23 +332,23 @@ msgstr "преждевременный конец файла (eof) (в допо�
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable символы в ASCII кодировке - вероятно использовался плохой "
 "MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "секретный ключ не найден"
@@ -355,15 +358,15 @@ msgstr "секретный ключ не найден"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "не могу делать это в пакетном режиме\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
@@ -371,150 +374,150 @@ msgstr "Ваш выбор (?-подробнее)? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Без указания причины"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "не выполнено"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "обновить предпочтения"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недопустимый символ в строке предпочтений\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недопустимый символ в строке предпочтений\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "ошибка: неверный отпечаток\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "показать отпечаток"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "ошибка: неверный отпечаток\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -522,132 +525,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Выберите причину отзыва:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "показать эту справку"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Ключ доступен: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "сменить срок действия"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "показать отпечаток"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "создать новую пару ключей"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -655,44 +658,44 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Повторите пароль: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -702,14 +705,14 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ `%s' не найден: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
@@ -896,31 +899,31 @@ msgstr "ВНИМАНИЕ: не могу удалить временный фай
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %08lX: не защищен - пропущен\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %08lX: PGP 2.x стиля - пропущен\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %08lX не имеет SK контрольной суммы\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -928,128 +931,128 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "создать отделенную (detached) подпись"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "проверка подписей на ключе"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1059,51 +1062,51 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "подробно"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1111,7 +1114,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1131,18 +1134,18 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки (fingerprints)\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "О найденных ошибка сообщайте <[email protected]>.\n"
 "Подпишитесь на русскоязычную группу рассылки GnuPG-ru отправив письмо по "
 "адресу [email protected] с темой subscribe.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1152,7 +1155,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1160,460 +1163,460 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = sign found in group definition \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "файл конфигурации содержит неизвестный параметр \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек старого формата `%s' проигнорирован\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек `%s' не обнаружен\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл настроек `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "настройки взяты из файла `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного использования!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра \"%s\" не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s недопустимая таблица символов\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URI сервера ключей\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заменит %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s недопустимо использовать с %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифровки сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 1, 2 или 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой (0) режим S2K строго не рекомендуется\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s не работает пока с %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "неудача при получении с сервера ключей: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "не удалось экспортировать ключ: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "неудача при поиске на сервере ключей: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "неудача при обновлении на сервере ключей: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1621,23 +1624,23 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания должно содержать '@' символ\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил сертификации неверен\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
@@ -1646,54 +1649,54 @@ msgstr "заданный URL правил подписи неверен\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID Не найден]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Недействительный ключ %08lX разрешен параметром --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %08lX - игнорирую\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "используется вторичный ключ %08lX вместо главного %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %08lX: секретный ключ без открытого - пропущен\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "используются ключи из данной таблицы ключей"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 "при несоответствии отметки времени ограничиваться только предупреждением"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2022,379 +2025,400 @@ msgstr "Нет доступной справки"
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизменённых секретных ключей: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Вы подписали данные User ID:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %08lX: не имеет User ID\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %08lX: HKP повреждение подключа исправлено\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %08lX: принят ключ без самоподписи '%s'\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %08lX: нет действительных User ID\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %08lX: не найден открытый ключ: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %08lX: новый ключ - пропущен\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %08lX: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %08lX: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %08lX: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %08lX: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %08lX: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %08lX: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %08lX: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %08lX: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %08lX: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %08lX: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %08lX: \"%s\" не изменен\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %08lX: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %08lX: секретный ключ импортирован\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %08lX: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %08lX: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ключ %08lX: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %08lX: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %08lX: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %08lX: нет User ID для подписи\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "ключ %08lX: неподдерживаемый алгоритм с открытым ключом у \"%s\" \n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %08lX: неправильная самоподпись на \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %08lX: нет подключа для связи ключей\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %08lX: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %08lX: неправильная связь подключей\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %08lX: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %08lX: нет подключа для отзыва ключа\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %08lX: неправильный отзыв подключа\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %08lX: удален многократный отзыв подключа\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %08lX: пропущен User ID '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %08lX: пропущен подключ\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %08lX: не экспортируемая подпись (класс %02x) - пропущена\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %08lX: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %08lX: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %08lX: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %08lX: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "ключ %08lX: неизвестный класс подписи (0x%02X) - пропущена\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %08lX: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: запрашиваю ключ отзыва %08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: ключ отзыва %08lX не получен.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %08lX: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %08lX: direct key signature добавлена\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "открытый ключ не соотвествует секретному!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "пропущено: секретный ключ уже имеется\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "пропущено: секретный ключ уже имеется\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2410,51 +2434,51 @@ msgstr "создана таблица ключей `%s'\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2467,53 +2491,53 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Срок действия User ID \"%s\" истек."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2522,11 +2546,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2535,11 +2559,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2548,55 +2572,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже был локально подписан ключом %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже был подписан ключом %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действия данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2606,32 +2630,32 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваш выбор? (введите '?' для большей информации): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2640,91 +2664,100 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Я не проверял этот ключ совсем.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Я частично проверил этот ключ.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Секретная часть главного ключа отсутствует.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2732,11 +2765,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2744,371 +2777,412 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "показать отпечаток"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "выбрать вторичный ключ N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "вывести список подписей"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "отзыв подписей"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "подписать ключ"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "локально подписать ключ"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Подсказка: Выберите User IDs для подписи\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "удалить User ID"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "добавить вторичный ключ"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "удалить вторичный ключ"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "удалить подпись"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Действительно обновить предпочтения для выбранных User ID? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "сменить срок действия"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "пометить User ID как главный"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "переключение между открытым и закрытым ключами"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "установить предпочтения"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "обновить предпочтения"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Действительно обновить предпочтения для выбранных User ID? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "не могу проанализировать URI сервера ключей\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "отзыв подписей"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Действительно отозвать ВСЕ выбранные User ID? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "отзыв User ID"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "отзыв подключей"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "отключить ключ"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "отключить ключ"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "показать фото ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите User IDs для подписи\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "неизвестный класс подписи"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Вы действительно хотите отозвать данный ключ? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные ключи? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный ключ? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Данный ключ может быть отозван ключом %s "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван ключом %s "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "не могу создать %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3116,19 +3190,19 @@ msgstr ""
 "Заметьте, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3136,7 +3210,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID отмеченного как главный.  Данная команда может\n"
 "              использовать другой User ID в качестве главного.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3145,45 +3219,45 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы можете не добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3192,159 +3266,171 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить PGP 2.x ключ, как назначенный отзывающим\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван отзывающим ключом!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим не возможно будет отменить!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Выделите не более одного вторичного ключа.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действия вторичного ключа.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Нет вторичного ключа с индексом %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   подписан %08lX  %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок подписи закончился %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   отозван %08lX  %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "User ID \"%s\" уже отозван\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "User ID \"%s\" уже отозван\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа 0x%08lX (uid %d)\n"
@@ -3374,145 +3460,145 @@ msgstr "слишком много `%c' предпочтений\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимый символ в строке предпочтений\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашифровать данные"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину 1024 бита.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вы выбрали? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "приведен к размеру %u бит\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3528,7 +3614,7 @@ msgstr ""
 "      <n>m = срок действия n месяцев\n"
 "      <n>y = срок действия n лет\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3544,29 +3630,39 @@ msgstr ""
 "      <n>m = срок действия подписи n месяцев\n"
 "      <n>y = срок действия подписи n лет\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Подпись действительна до? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "неправильное значение\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s не имеет ограничения срока действия\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s не имеет ограничения срока действия\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s действителен до: %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Подпись действительна до %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3574,12 +3670,12 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/n) "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3595,44 +3691,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3643,28 +3739,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя и комментарий\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3672,12 +3768,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3689,7 +3785,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3701,112 +3797,113 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Заметьте, что данный ключ не может использоваться для шифрования.  Вы "
 "можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: секретный ключ %08lX просрочен с %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3815,65 +3912,67 @@ msgstr ""
 msgid "never     "
 msgstr "никогда   "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Критические правила для подписи: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Правила для подписи: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Критическое примечание к подписи: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "нечитаемо для человека"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [годен до: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Отпечаток ключа ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3925,130 +4024,130 @@ msgstr "%s: таблица ключей создана\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ `%s' не найден: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "ключ `%s' не найден: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрос ключа %08lX с %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "запрос ключа %08lX с %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "поиск \"%s\" на HKP сервере %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "подписанный Вашим ключом %08lX  %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на HKP сервере %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на HKP сервере %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "ошибка сервера ключей"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "неудача при получении с сервера ключей: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "запрос ключа %08lX с %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "запрос ключа %08lX с %s\n"
@@ -4256,85 +4355,85 @@ msgstr "старый (PGP 2.x) стиль подписи\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание образа памяти (core dumps): %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "не могу открыть файл: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "нереализованный алгоритм шифрования"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "использование хэш-функции %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "смотрите подробности на http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "не сжато"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "не сжато"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "настройки взяты из файла `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный получатель по умолчанию `%s'\n"
@@ -4382,18 +4481,18 @@ msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны
 msgid "directory `%s' created\n"
 msgstr "создан каталог: %s\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный симметрично зашифрованный сеансовый "
 "ключ\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
@@ -4432,16 +4531,16 @@ msgstr "не могу подключиться к `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "коммуникационный проблемы с gpg-agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (главный идентификатор ключа %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4452,27 +4551,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %08lX, создан %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "пароль слишком длинный\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "неверный ответ от агента\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "проблема с агентом: агент вернул 0x%lx\n"
@@ -5003,20 +5102,20 @@ msgstr "метод защиты %d%s не поддерживается\n"
 msgid "protection digest %d is not supported\n"
 msgstr "метод защиты %d%s не поддерживается\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Неверный пароль; попробуйте еще раз"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ВНИМАНИЕ: обнаружен слабый ключ - смените пароль еще раз.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "создание нерекомендуемой 16-битной контрольной суммы для защиты ключа\n"
@@ -5373,12 +5472,12 @@ msgstr "%s: сбой добавления записи: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "не могу обработать строки текста длиннее %d символов\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
@@ -5856,6 +5955,33 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "выбрать вторичный ключ N"
+
+#~ msgid "list signatures"
+#~ msgstr "вывести список подписей"
+
+#~ msgid "sign the key"
+#~ msgstr "подписать ключ"
+
+#~ msgid "add a secondary key"
+#~ msgstr "добавить вторичный ключ"
+
+#~ msgid "delete signatures"
+#~ msgstr "удалить подпись"
+
+#~ msgid "change the expire date"
+#~ msgstr "сменить срок действия"
+
+#~ msgid "set preference list"
+#~ msgstr "установить предпочтения"
+
+#~ msgid "updated preferences"
+#~ msgstr "обновить предпочтения"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Нет вторичного ключа с индексом %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
@@ -5959,9 +6085,6 @@ msgstr ""
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/sk.po b/po/sk.po
index 188b4b475..7ae936e01 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -27,9 +27,9 @@ msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -65,8 +65,8 @@ msgstr "nem��em ��ta� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -120,146 +120,149 @@ msgstr ""
 "Nedostatok n�hodn�ch bajtov. Pros�m, pracujte s opera�n�m syst�mom, aby\n"
 "ste mu umo�nili z�ska� viac entropie (je potrebn�ch %d bajtov).\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
@@ -294,7 +297,7 @@ msgstr "neo�ak�van� k�dovanie ASCII:"
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
@@ -311,7 +314,7 @@ msgstr "pred�asn� koniec s�boru (v CRC)\n"
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
@@ -325,23 +328,23 @@ msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
 "pou�it� nespr�vny MTA\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
@@ -351,15 +354,15 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
@@ -367,150 +370,150 @@ msgstr "V� v�ber? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -518,132 +521,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -651,44 +654,44 @@ msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -698,14 +701,14 @@ msgstr "nemo�no otvori� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
@@ -897,31 +900,31 @@ msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -929,128 +932,128 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1060,55 +1063,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1117,7 +1120,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1137,17 +1140,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1157,7 +1160,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1165,468 +1168,468 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1634,23 +1637,23 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -1659,54 +1662,54 @@ msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
 # c-format
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2039,387 +2042,408 @@ msgstr "Pomoc nie je k dispoz�cii"
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2435,52 +2459,52 @@ msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2493,53 +2517,53 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2548,11 +2572,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2562,11 +2586,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2576,54 +2600,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2633,32 +2657,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2667,28 +2691,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2696,63 +2720,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2760,11 +2793,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2772,371 +2805,412 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "vyberte sekund�rny k��� N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "vyp�sa� zoznam podpisov"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "podp�sa� k���"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "prida� sekund�rny k���"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "zmaza� podpisy"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "zmeni� dobu platnosti"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "nastavi� zoznam predvolieb"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "aktualizova� predvo�by"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "revokova� podpisy"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "nastavi� k��� ako neplatn� (disable)"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "nastavi� k��� ako neplatn� (disable)"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Skuto�ne chcete revokova� tento k���? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Tento k��� m��e by� revokovan� k���om %s "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3144,19 +3218,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3164,7 +3238,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3173,45 +3247,45 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3220,159 +3294,171 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Neexistuje sekund�rny k��� s indexom %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3403,145 +3489,145 @@ msgstr "pr�li� ve�a `%c' predvolieb\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3557,7 +3643,7 @@ msgstr ""
 "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
 "      <n>y = doba platnosti k���a skon�� za n rokov\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3573,29 +3659,39 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "platnos� %s neskon��\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Platnos� podpisu vypr�� %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3603,12 +3699,12 @@ msgstr ""
 "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
 "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3625,44 +3721,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3673,27 +3769,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3701,12 +3797,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3718,7 +3814,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3730,63 +3826,64 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3794,7 +3891,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3802,40 +3899,40 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3844,65 +3941,67 @@ msgstr ""
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Kritick� podpisov� politika: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Podpisov� politika: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Kritick� podpisov� not�cia: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3954,130 +4053,130 @@ msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
@@ -4292,87 +4391,87 @@ msgstr "podpis star�ho typu (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "viac inform�ci� n�jdete v dokumente http://www.gnupg.cz/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -4420,17 +4519,17 @@ msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -4469,16 +4568,16 @@ msgstr "nem��em sa pripoji� k `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4489,27 +4588,27 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakcia od agenta\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
@@ -5045,20 +5144,20 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, sk�ste to znovu"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROVANIE: Zisten� slab� k��� - zme�te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generujem zastaral� 16 bitov� kontroln� s��et na ochranu tajn�ho k���a\n"
@@ -5428,12 +5527,12 @@ msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nem��em pracova� s riadkami dlh��mi ako %d znakov\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
@@ -5910,6 +6009,33 @@ msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "vyberte sekund�rny k��� N"
+
+#~ msgid "list signatures"
+#~ msgstr "vyp�sa� zoznam podpisov"
+
+#~ msgid "sign the key"
+#~ msgstr "podp�sa� k���"
+
+#~ msgid "add a secondary key"
+#~ msgstr "prida� sekund�rny k���"
+
+#~ msgid "delete signatures"
+#~ msgstr "zmaza� podpisy"
+
+#~ msgid "change the expire date"
+#~ msgstr "zmeni� dobu platnosti"
+
+#~ msgid "set preference list"
+#~ msgstr "nastavi� zoznam predvolieb"
+
+#~ msgid "updated preferences"
+#~ msgstr "aktualizova� predvo�by"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Neexistuje sekund�rny k��� s indexom %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key id u��vate�a"
 
@@ -6013,9 +6139,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/sv.po b/po/sv.po
index 67cbc7764..d0d593581 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -45,9 +45,9 @@ msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 msgid "no entropy gathering module detected\n"
 msgstr "ingen demon för entropisamling hittad\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -83,8 +83,8 @@ msgstr "kan inte läsa \"%s\": %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -141,146 +141,149 @@ msgstr ""
 "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
 "(Behöver %d fler byte)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fel vid skapande av `%s': %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
@@ -317,7 +320,7 @@ msgid "invalid dash escaped line: "
 msgstr "felaktig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppade över felaktigt radix64-tecken %02x \n"
@@ -335,7 +338,7 @@ msgstr "för tidigt filslut (i CRC-summan)\n"
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
@@ -349,16 +352,16 @@ msgstr "för tidigt filslut (i den avslutande raden)\n"
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -366,7 +369,7 @@ msgstr ""
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "den hemliga nyckeln är inte tillgänglig"
@@ -376,15 +379,15 @@ msgstr "den hemliga nyckeln är inte tillgänglig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
@@ -392,150 +395,150 @@ msgstr "Vad väljer du? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Ingen anledning har angivits"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "inte behandlade"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ingen tillhörande öppen nyckel: %s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uppdaterat inställningar"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -543,130 +546,130 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "ändra utgångsdatum"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
@@ -674,45 +677,45 @@ msgstr "Felaktigt kommando (försök med \"help\")\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetera lösenmeningen: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
 # se förra kommentaren
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -722,14 +725,14 @@ msgstr "kan inte öppna \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
@@ -927,31 +930,31 @@ msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -959,130 +962,130 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "visa en lista på nycklar"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "visa en lista på nycklar och signaturer"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "visa en lista på nycklar och fingeravtryck"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den öppna nyckelringen"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1092,53 +1095,53 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "Fråga före ersättning"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1146,7 +1149,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1166,18 +1169,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera gärna fel till <[email protected]>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <[email protected]>.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1187,7 +1190,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1195,473 +1198,473 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "felaktiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1672,23 +1675,23 @@ msgstr ""
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
@@ -1697,57 +1700,57 @@ msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - avstängd\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ogiltig nyckel %08lX  tvingat giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX "
 "- hoppar över\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2094,358 +2097,359 @@ msgstr "Det finns ingen hjälp tillgänglig"
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nya spärrar av nycklar: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en egensignatur\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
 "över den\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med "
 "spärrcertifikatet\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID  \"%s"
 "\"\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig egensignatur på användar-id \"%s\"\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
@@ -2453,38 +2457,60 @@ msgstr ""
 "signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
-#: g10/import.c:1655
+# nyckeln eller klassen?
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr ""
+"nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Hämtar spärrnyckel %08lX\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Spärrnyckeln %08lX saknas.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "hoppade över: hemlig nyckel finns redan\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "hoppade över: hemlig nyckel finns redan\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2500,51 +2526,51 @@ msgstr "%s: nyckelring skapad\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2558,53 +2584,53 @@ msgstr ""
 "källor...)?\n"
 "\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt på denna användare\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt på denna användare\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för nvändar-ID \"%s\" har gått ut.."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2613,11 +2639,11 @@ msgstr ""
 "Egensignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Will du göra om den till en egensignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2626,13 +2652,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
 "n) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2641,44 +2667,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständigt exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2686,11 +2712,11 @@ msgstr ""
 "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
 "läge\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2699,33 +2725,33 @@ msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 "     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "     (1) Jag har inte kontrollerat identiteten alls.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "     (2) Jag har gjort viss kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "     (3) Jag har gjort en noggrann kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv '?' för mer information): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2734,14 +2760,14 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2749,7 +2775,7 @@ msgstr ""
 "VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2757,7 +2783,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2765,7 +2791,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -2773,56 +2799,65 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2830,11 +2865,11 @@ msgstr ""
 "Skriv in den nya lösenmening för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2842,374 +2877,417 @@ msgstr ""
 "Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "visa en lista på nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "välj undernyckel N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "visa en lista på signaturer"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "signera nyckeln"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Tips: Välj de användarID:n du vill signera\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "lägg till ett foto som användaridentitet"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "lägg till en undernyckel"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "ta bort en undernyckel"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "ta bort signaturer"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "ändra utgångsdatum"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "markera användaridentiteten som huvudidentitet"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "visa en lista på  inställningar (expertläge)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "visa en lista på inställningar (utförligt)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "ange inställningslista"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "uppdaterat inställningar"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "ändra lösenmening"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "återkalla signaturer"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "spärra en användaridentitet"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "stäng av en nyckel"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "stäng av en nyckel"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "visa foto-ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "okänd signaturklass"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vill du verkligen spärra denna användaridentitet? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Vill du verkligen spärra denna nyckel? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda nycklarna? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Denna nyckel kan spärras av nyckeln %s"
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för ett användar-ID av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3217,19 +3295,19 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3238,7 +3316,7 @@ msgstr ""
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3248,46 +3326,46 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3296,33 +3374,33 @@ msgstr ""
 "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna "
 "nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte ange en spärrnyckel för en PGP 2-nyckel.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ändra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3330,135 +3408,147 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3 egensignatur på användar-id \"%s\"\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Ingen undernyckel med index %d\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? (j/N)"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på ett användar-ID är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Användar-ID \"%s\" är redan spärrad\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Användar-ID \"%s\" är redan spärrad\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n"
@@ -3488,146 +3578,146 @@ msgstr "för många `%c' inställningar\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "skriver egensignatur\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "felaktig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "kryptera data"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3644,7 +3734,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3660,29 +3750,39 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "För hur lång tid ska signaturen vara giltig? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "felaktigt värde\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "Giltighetstiden för %s går aldrig ut\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "Giltighetstiden för %s går ut vid följande tidpunkt: %s\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Giltighetstiden för signaturen går ut %s\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3690,12 +3790,12 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3712,44 +3812,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Felaktigt tecken i namnet\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Felaktigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3760,29 +3860,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
 # Ej solklart vad förkortningarna står för
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3790,12 +3890,12 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3806,7 +3906,7 @@ msgstr ""
 "Jag kommer att göra det ändå. Du kan ändra din lösenmening när som helst\n"
 "om du använder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3818,65 +3918,66 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropi.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den öppna nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "hittade ingen öppen nyckelring att skriva till: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av öppna nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "den öppna och den  hemliga nyckeln är skapade och signerade.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Observera att denna nyckel inte kan användas för kryptering. Du kommer\n"
 "kanske att vilja använda kommandot \"--edit-key\" för att skapa en\n"
 "undernyckel för detta syfte.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3884,7 +3985,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3892,40 +3993,40 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3934,65 +4035,67 @@ msgstr ""
 msgid "never     "
 msgstr "aldrig"
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig noteringsdata hittades\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Viktig signaturnotation: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "Signaturnotering: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "inte möjlig att läsa för människor"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[går ut: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "    Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "     Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4046,128 +4149,128 @@ msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
@@ -4387,85 +4490,85 @@ msgstr "signatur av den gamla (PGP 2.x) typen\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "krypteringsalgorimten är inte införd"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Insticksprogram för IDEA-kryptering är inte installerat\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "Mer information finns på: http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: alternativet är föråldrat\"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Okomprimerad"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
@@ -4514,16 +4617,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: katalog skapad\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@ -4564,16 +4667,16 @@ msgstr "kan inte ansluta till \"%s\": %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problem vid kommunikation med GPG-Agent\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med GPG-Agent, stänger av den\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4584,27 +4687,27 @@ msgstr ""
 "användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenmeningen\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Ange lösenmening\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "lösenmeningen är för lång\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "felaktigt svar från GPG-Agent\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
@@ -5160,21 +5263,21 @@ msgstr "skyddsalgoritmen %d%s stöds inte\n"
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Fel lösenmening; försök igen!"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenmening igen.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
@@ -5559,12 +5662,12 @@ msgstr "%s: misslyckades med att lägga till en post: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
@@ -6049,6 +6152,33 @@ msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "välj undernyckel N"
+
+#~ msgid "list signatures"
+#~ msgstr "visa en lista på signaturer"
+
+#~ msgid "sign the key"
+#~ msgstr "signera nyckeln"
+
+#~ msgid "add a secondary key"
+#~ msgstr "lägg till en undernyckel"
+
+#~ msgid "delete signatures"
+#~ msgstr "ta bort signaturer"
+
+#~ msgid "change the expire date"
+#~ msgstr "ändra utgångsdatum"
+
+#~ msgid "set preference list"
+#~ msgstr "ange inställningslista"
+
+#~ msgid "updated preferences"
+#~ msgstr "uppdaterat inställningar"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Ingen undernyckel med index %d\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key användaridentitet"
 
@@ -6155,9 +6285,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/tr.po b/po/tr.po
index c0352fcc8..5e017a8ae 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-07-08 08:10+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -30,9 +30,9 @@ msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -68,8 +68,8 @@ msgstr "\"%s\" okunamıyor: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -124,146 +124,149 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 #, fuzzy
 msgid "generating new key\n"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
@@ -298,7 +301,7 @@ msgstr "beklenmeyen zırh: "
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
@@ -315,7 +318,7 @@ msgstr "dosya sonu belirsiz (CRC içinde)\n"
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lx - %06lx\n"
@@ -329,23 +332,23 @@ msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
 "sunucusu kullanılmış\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "gizli anahtar kullanışsız"
@@ -355,15 +358,15 @@ msgstr "gizli anahtar kullanışsız"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
@@ -371,152 +374,152 @@ msgstr "Seçiminiz? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 #, fuzzy
 msgid "unspecified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 #, fuzzy
 msgid "not forced"
 msgstr "işlenemedi"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 #, fuzzy
 msgid "Language preferences: "
 msgstr "güncelenmiş tercihler"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "hata: parmakizi geçersiz\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr " Parmak izi:"
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "hata: parmakizi geçersiz\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -524,132 +527,132 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 #, fuzzy
 msgid "show admin commands"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 #, fuzzy
 msgid "list all available data"
 msgstr "Anahtar burada: "
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 #, fuzzy
 msgid "change the login name"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 #, fuzzy
 msgid "change the language preferences"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "parmak izini gösterir"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 #, fuzzy
 msgid "generate new keys"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
@@ -657,46 +660,46 @@ msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Tekrar: "
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -706,14 +709,14 @@ msgstr "`%s' açılamadı\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
@@ -906,31 +909,31 @@ msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:384
+#: g10/export.c:395
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "UYARI: gizli anahtar %08lX basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -938,128 +941,128 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1069,51 +1072,51 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1121,7 +1124,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1141,15 +1144,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1159,7 +1162,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1167,457 +1170,457 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı \"%s\" içinde = işareti yok\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s henüz %s ile çalışmıyor\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s şifreleme algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh başarısız: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1625,23 +1628,23 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
@@ -1650,55 +1653,55 @@ msgstr "belirtilen imza güvence adresi geçersiz\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli "
 "oldu\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "anahtarlar bu anahtarlıktan alınır"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2017,391 +2020,412 @@ msgstr "yardım mevcut değil"
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "şu ana kadar herşey yolunda giderek %lu anahtar işlenmiş\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:548
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliği '%s' kabul edildi\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %08lX: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %08lX: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %08lX: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %08lX: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %08lX: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %08lX: \"%s\" değişmedi\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "%08lX anahtarı: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %08lX: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %08lX: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 "anahtar %08lX: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %08lX: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %08lX: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n"
+
+#: g10/import.c:1680
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %08lX: çift kullanıcı kimliği saptandı - katıştırıldı\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %08lX alınıyor\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %08lX mevcut değil.\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "atlandı: gizli anahtar zaten var\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "atlandı: gizli anahtar zaten var\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2417,51 +2441,51 @@ msgstr "`%s' anahtar zinciri oluşturuldu\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2474,53 +2498,53 @@ msgstr ""
 "(pasportuna mı bakarsınız yoksa farklı kaynaklardan\n"
 "parmakizlerini mi kontrol edersiniz...)? kararınızı verin\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2529,11 +2553,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2542,12 +2566,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2556,44 +2580,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2601,11 +2625,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2614,32 +2638,32 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (bilgi için '?' giriniz): "
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2648,90 +2672,99 @@ msgstr ""
 "Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Her şeyiyle bu anahtarı kontrol edemedim.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2739,13 +2772,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2753,374 +2786,420 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "parmak izini gösterir"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "N yardımcı anahtarını seçer"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "imzaları listeler"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "anahtarı imzalar"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "kullanıcı kimliğini siler"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "bir yardımcı anahtar ekler"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "imzaları siler"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr ""
+"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
+"musunuz? "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "son kullanım tarihini değiştirir"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "tercih listesi oluşturmak için"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "güncelenmiş tercihler"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr ""
+"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
+"musunuz? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "imzaları yürürlükten kaldırır"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "bir kullanıcı kimliği yürürlükten kaldırır"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "bir anahtarı iptal eder"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "bir anahtarı iptal eder"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "foto kimliğini gösterir"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu `%s' okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "bilinmeyen imza sınıfı"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
+
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
 "musunuz? "
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr ""
+"Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
+
+#: g10/keyedit.c:2384
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3128,19 +3207,19 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 #, fuzzy
 msgid "revoked"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
@@ -3149,7 +3228,7 @@ msgstr ""
 "       başka bir kullanıcı kimliğinin birincil varsayılmasına sebep "
 "olabilir.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3158,45 +3237,45 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3206,41 +3285,41 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3248,130 +3327,142 @@ msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H): "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "%d endeksine sahip yardımcı anahtar yok\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+
+#: g10/keyedit.c:4318
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3403,145 +3494,145 @@ msgstr "`%c' tercih çok fazla\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 #, fuzzy
 msgid "Encrypt"
 msgstr "veriyi şifreler"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3557,7 +3648,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3573,29 +3664,39 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s hep geçerli olacak\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s hep geçerli olacak\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s %s sonra geçersiz olacak\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3603,12 +3704,12 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/h)? "
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 #, fuzzy
 msgid ""
 "\n"
@@ -3625,44 +3726,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3673,29 +3774,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3703,12 +3804,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3720,7 +3821,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3733,70 +3834,71 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için ikinci bir anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3804,41 +3906,41 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? "
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3847,65 +3949,67 @@ msgstr ""
 msgid "never     "
 msgstr "asla    "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "Kritik imza guvencesi: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "Kritik imza niteleyici: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -3958,130 +4062,130 @@ msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu hatası"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu hatası"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
@@ -4293,48 +4397,48 @@ msgstr "eski stil (PGP 2.x) imza\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "dosya açılamadı: %s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "tamamlanmamış şifre algoritması"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
 "isteniyor\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
@@ -4342,41 +4446,41 @@ msgstr ""
 "adresine\n"
 "bakınız.\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
@@ -4425,16 +4529,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: dizin oluşturuldu\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -4473,16 +4577,16 @@ msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %08lX)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4493,27 +4597,27 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %08lX, oluşturulan %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "Parola çok uzun\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "yanıt geçersiz\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
@@ -5052,22 +5156,22 @@ msgstr "koruma algoritması %d%s desteklenmiyor\n"
 msgid "protection digest %d is not supported\n"
 msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
 "değiştirin.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı "
@@ -5435,12 +5539,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
@@ -5918,6 +6022,33 @@ msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "N yardımcı anahtarını seçer"
+
+#~ msgid "list signatures"
+#~ msgstr "imzaları listeler"
+
+#~ msgid "sign the key"
+#~ msgstr "anahtarı imzalar"
+
+#~ msgid "add a secondary key"
+#~ msgstr "bir yardımcı anahtar ekler"
+
+#~ msgid "delete signatures"
+#~ msgstr "imzaları siler"
+
+#~ msgid "change the expire date"
+#~ msgstr "son kullanım tarihini değiştirir"
+
+#~ msgid "set preference list"
+#~ msgstr "tercih listesi oluşturmak için"
+
+#~ msgid "updated preferences"
+#~ msgstr "güncelenmiş tercihler"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "%d endeksine sahip yardımcı anahtar yok\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key KULL-KML"
 
@@ -6021,9 +6152,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #, fuzzy
 #~ msgid "addcardkey"
 #~ msgstr "addkey"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a3f2c83bd..a07bfe99b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
 "PO-Revision-Date: 2004-11-08 21:30+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -29,9 +29,9 @@ msgstr "少于 %d 位时不能生成质数\n"
 msgid "no entropy gathering module detected\n"
 msgstr "检测不到熵数搜集模块\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -67,8 +67,8 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -122,143 +122,146 @@ msgstr ""
 "随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵数！\n"
 "(还需要%d字节)\n"
 
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|新的管理员 PIN"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公共指数\n"
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签字：%lu\n"
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr "PIN [完成签字：%lu]"
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
 #, c-format
 msgid "error getting serial number: %s\n"
 msgstr "取得序列号时出错：%s\n"
 
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
 msgid "reading the key failed\n"
 msgstr "无法读出密钥\n"
 
@@ -291,7 +294,7 @@ msgstr "与预期不符的 ASCII 封装："
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
@@ -308,7 +311,7 @@ msgstr "文件先于预期结束(CRC 部分未结束)\n"
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
@@ -321,21 +324,21 @@ msgstr "文件先于预期结束(于结尾处)\n"
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
@@ -345,14 +348,14 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
 msgstr "您的选择？ "
 
@@ -360,138 +363,138 @@ msgstr "您的选择？ "
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:378
+#: g10/card-util.c:379
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:379
+#: g10/card-util.c:380
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:548
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:729
+#: g10/card-util.c:756
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:737
+#: g10/card-util.c:764
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:746
+#: g10/card-util.c:773
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:781
+#: g10/card-util.c:808
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:829
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:825
+#: g10/card-util.c:852
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:873
+#: g10/card-util.c:900
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:874
+#: g10/card-util.c:901
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:883
+#: g10/card-util.c:910
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -502,116 +505,116 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签字密钥\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
 msgid "   (2) Encryption key\n"
 msgstr "  (1) 加密密钥\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
 msgstr "  (1) 认证密钥\n"
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签字是否必须"
 
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -619,7 +622,7 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "请插入卡并回车，或输入‘c’来取消："
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -628,37 +631,37 @@ msgstr ""
 "请取出当前的卡，并插入有下列序列号的卡：\n"
 "  %.*s\n"
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "就绪后请回车，或输入‘c’取消"
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "输入 PIN："
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
 msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
 msgstr "输入 PIN："
 
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
 msgid "Repeat this PIN: "
 msgstr "再次输入此 PIN："
 
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -668,14 +671,14 @@ msgstr "无法打开‘%s’\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
@@ -855,31 +858,31 @@ msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:182
+#: g10/export.c:183
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:211
+#: g10/export.c:212
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:219
+#: g10/export.c:220
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:384
+#: g10/export.c:395
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
@@ -887,127 +890,127 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签字"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签字"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
 msgstr "生成一份分离的签字"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
 msgstr "验证签字"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
 msgstr "列出密钥和签字"
 
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签字"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
 msgstr "为某把密钥添加签字"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签字"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签字"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
@@ -1017,51 +1020,51 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签字或解密"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
 msgstr "详细模式"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1069,7 +1072,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1089,17 +1092,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1109,7 +1112,7 @@ msgstr ""
 "签字、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1117,470 +1120,470 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1021
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1218
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1221
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1224
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/g10.c:1226
+#: g10/g10.c:1230
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/g10.c:1229
+#: g10/g10.c:1233
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1236
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1242
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1241
+#: g10/g10.c:1245
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1248
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1250
+#: g10/g10.c:1254
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1253
+#: g10/g10.c:1257
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1256
+#: g10/g10.c:1260
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1397
+#: g10/g10.c:1401
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2076
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/g10.c:2292
+#: g10/g10.c:2293
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/g10.c:2317
+#: g10/g10.c:2318
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/g10.c:2320
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/g10.c:2347
+#: g10/g10.c:2348
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2351
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2373
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/g10.c:2375
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/g10.c:2748
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大认证深度一定要介于 1 和 255 之间\n"
 
-#: g10/g10.c:2750
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/g10.c:2752
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:2817
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/g10.c:2863
+#: g10/g10.c:2864
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/g10.c:2868
+#: g10/g10.c:2869
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/g10.c:2873
+#: g10/g10.c:2874
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/g10.c:3000
+#: g10/g10.c:3001
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/g10.c:3023
+#: g10/g10.c:3024
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3028
+#: g10/g10.c:3029
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/g10.c:3074
+#: g10/g10.c:3075
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3079
+#: g10/g10.c:3080
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/g10.c:3274
+#: g10/g10.c:3275
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/g10.c:3276
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/g10.c:3278
+#: g10/g10.c:3279
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/g10.c:3289
+#: g10/g10.c:3290
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/g10.c:3299
+#: g10/g10.c:3300
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
 msgstr "标记值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/g10.c:3939
+#: g10/g10.c:3940
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -1588,51 +1591,51 @@ msgstr "给定的首选公钥服务器 URL 无效\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2420
-#, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+#: g10/getkey.c:2458
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
 msgstr "从这个钥匙环里取用密钥"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1947,322 +1950,323 @@ msgstr "没有可用的帮助"
 msgid "No help available for `%s'"
 msgstr "‘%s’没有可用的帮助"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:258
+#: g10/import.c:259
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签字：%lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的\n"
 
-#: g10/import.c:547
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
 msgstr "算法：\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:596
+#: g10/import.c:597
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:715
+#: g10/import.c:716
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:730
+#: g10/import.c:731
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
 
-#: g10/import.c:736
+#: g10/import.c:737
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签字所致\n"
 
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:754
+#: g10/import.c:755
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:793
+#: g10/import.c:794
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:877
+#: g10/import.c:878
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:880
+#: g10/import.c:881
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签字\n"
 
-#: g10/import.c:883
+#: g10/import.c:884
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签字\n"
 
-#: g10/import.c:886
+#: g10/import.c:887
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:889
+#: g10/import.c:890
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:910
+#: g10/import.c:911
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1055
+#: g10/import.c:1056
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1066
+#: g10/import.c:1067
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1094
+#: g10/import.c:1095
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1124
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1134
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1164
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1207
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1238
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1303
+#: g10/import.c:1304
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签字没有用户标识\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1320
+#: g10/import.c:1321
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
 
-#: g10/import.c:1338
+#: g10/import.c:1339
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1352
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1367
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1389
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1416
+#: g10/import.c:1417
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1459
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1479
+#: g10/import.c:1480
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2271,56 +2275,76 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1506
+#: g10/import.c:1507
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1516
+#: g10/import.c:1517
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1533
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1547
+#: g10/import.c:1548
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
+
+#: g10/import.c:1680
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1717
+#: g10/import.c:1742
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1731
+#: g10/import.c:1756
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1790
+#: g10/import.c:1815
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1824
+#: g10/import.c:1849
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签字\n"
 
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "公钥与私钥不吻合！\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "私钥已存储在卡上\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "私钥已存储在卡上\n"
+
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
@@ -2336,51 +2360,51 @@ msgstr "钥匙环‘%s’已建立\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
 msgstr "[自身签字]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签字\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签字\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签字因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签字因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2391,17 +2415,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = 我勉强相信\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = 我完全相信\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2410,36 +2434,36 @@ msgstr ""
 "请输入这份信任签字的深度。\n"
 "深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签字吗？(y/N)"
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签字。\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2448,11 +2472,11 @@ msgstr ""
 "“%s”里的自身签字\n"
 "是 PGP 2.x 样式的签字。\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2461,11 +2485,11 @@ msgstr ""
 "您目前为“%s”的签字\n"
 "已经过期了。\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2474,53 +2498,53 @@ msgstr ""
 "您目前在“%s”的签字\n"
 "是一份本地签字。\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把他升级成可以完全导出的签字？(y/N)"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签字\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签字\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签字吗？(y/N)"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s签字\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 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:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2529,32 +2553,32 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2563,66 +2587,75 @@ msgstr ""
 "您真的确定要签字这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签字。\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签字不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签字不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签字会被标记成不可导出。\n"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签字会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签字时失败： %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "主钥的私钥部分无法取用。\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2630,11 +2663,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2642,375 +2675,419 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签字移动到正确的位置去\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
 msgstr "显示指纹"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "选择子钥 N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "列出签字"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "吊销签字"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "为密钥添加签字"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
 msgstr "为密钥添加本地签字"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "提示：选择要添加签字的用户标识\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
 msgstr "删除一个用户/照片标识"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "增加一把子钥"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
 msgstr "删除一把子钥"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "删除签字"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "真的要更新被选择用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "更改使用期限"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "您不能变更v3密钥的使用期限\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
 msgstr "设定首选用户标识"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "设定首选项"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "更新过的首选项"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "真的要更新被选择用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
+#: g10/keyedit.c:1360
+#, fuzzy
+msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "设定首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "吊销签字"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "真的要吊销所有被选择的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
 msgstr "吊销一个用户标识"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
 msgstr "吊销一把子钥"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "禁用一把密钥"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
 msgstr "启用一把密钥"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "禁用一把密钥"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
 msgstr "显示照片标识"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签字吗？(y/N)"
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签字的用户标识\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签字等级"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有被选择的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除被选择的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有被选择的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1759
-msgid "Do you really want to revoke the selected keys? (y/N) "
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "您真的想要吊销这把密钥吗？(y/N)"
+
+#: g10/keyedit.c:1822
+#, fuzzy
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的想要吊销被选择的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1760
-msgid "Do you really want to revoke this key? (y/N) "
+#: g10/keyedit.c:1824
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的想要吊销这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新被选择用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "这把密钥可被 %s 密钥 %s 吊销"
+
+#: g10/keyedit.c:2384
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3019,45 +3096,45 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签字吗？(y/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3066,160 +3143,172 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "     增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一把子钥。\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
 msgstr "正在变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更v3密钥的使用期限\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有一致的签字\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签字\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "没有索引为 %d 的子钥\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签字已在 %s 过期。\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
 
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签字：\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "用户标识“%s”已经被吊销。\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "用户标识“%s”已经被吊销。\n"
+
+#: g10/keyedit.c:4318
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -3246,143 +3335,143 @@ msgstr "太多首选压缩算法\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
 msgstr "正在写入直接签字\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
 msgstr "正在写入自身签字\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签字\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
 msgid "Sign"
 msgstr "签字"
 
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "  (%c) 选择是否用于签字\n"
 
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "  (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "  (%c) 已完成\n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签字)\n"
 
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签字)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 1024 位。\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(1024)"
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3398,7 +3487,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3414,29 +3503,39 @@ msgstr ""
 "      <n>m = 签字在 n 月后过期\n"
 "      <n>y = 签字在 n 年后过期\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
 msgstr "签字的有效期限是多久？(0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
 msgstr "%s 永远不会过期\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s 永远不会过期\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
 msgstr "%s 将在 %s 过期\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "这份签字在 %s 过期。\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3444,11 +3543,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3464,44 +3563,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3512,27 +3611,27 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3540,12 +3639,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
@@ -3557,7 +3656,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
@@ -3567,107 +3666,108 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签字。\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr "RSA 余数的长度不为 %d\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr "公钥指数太大(超过 32 位)\n"
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr "RSA 质数的长度不为 %d\n"
@@ -3676,65 +3776,67 @@ msgstr "RSA 质数的长度不为 %d\n"
 msgid "never     "
 msgstr "永不过期"
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
 msgstr "关键签字策略："
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
 msgstr "签字策略："
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
 msgstr "关键首选公钥服务器："
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告：找到无效的标记数据\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
 msgstr "关键签字标记："
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
 msgstr "签字标记："
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
 msgstr "不是人类能读懂的"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:729
+#: g10/keylist.c:792
 #, c-format
 msgid "expired: %s)"
 msgstr "已过期：%s)"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
 msgstr "子钥指纹："
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
 msgid "      Key fingerprint ="
 msgstr "              密钥指纹 ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
 msgstr "     卡序列号 ="
 
@@ -3786,123 +3888,123 @@ msgstr "%s：钥匙环已建立\n"
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
@@ -4110,84 +4212,84 @@ msgstr "旧式(PGP 2.x)签字\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: g10/misc.c:190
+#: g10/misc.c:204
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: g10/misc.c:299
+#: g10/misc.c:313
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/misc.c:314
+#: g10/misc.c:328
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "尚未实现的对称加密算法"
 
-#: g10/misc.c:329
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s签字，散列算法 %s\n"
 
-#: g10/misc.c:334
+#: g10/misc.c:348
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "请访问 http://www.gnupg.org/why-not-idea.html 以获得更详细的信息\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:695
 msgid "Uncompressed"
 msgstr "不压缩"
 
-#: g10/misc.c:706
+#: g10/misc.c:720
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:973
+#: g10/misc.c:987
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:998
+#: g10/misc.c:1012
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -4234,16 +4336,16 @@ msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
@@ -4282,16 +4384,16 @@ msgstr "无法连接至‘%s’：%s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "与 gpg-agent 通讯有问题\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序的问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(主钥匙号 %s)"
 
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4302,27 +4404,27 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "密码太长\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "代理程序响应无效\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "代理程序的问题：代理程序返回 0x%lx\n"
@@ -4831,20 +4933,20 @@ msgstr "保护算法 %d%s 未被支持\n"
 msgid "protection digest %d is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
 msgstr "无效的密码；请再试一次"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s……\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告：检测到弱密钥――请更换密码。\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在产生私钥保护使用的旧式 16 位校验和\n"
 
@@ -5184,12 +5286,12 @@ msgstr "%s：附加记录时失败：%s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "无法处理长于 %d 字符的文本行\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "输入行长度超过 %d 字符\n"
@@ -5664,6 +5766,33 @@ msgstr "安全内存未初始化，不能进行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
+#~ msgid "select secondary key N"
+#~ msgstr "选择子钥 N"
+
+#~ msgid "list signatures"
+#~ msgstr "列出签字"
+
+#~ msgid "sign the key"
+#~ msgstr "为密钥添加签字"
+
+#~ msgid "add a secondary key"
+#~ msgstr "增加一把子钥"
+
+#~ msgid "delete signatures"
+#~ msgstr "删除签字"
+
+#~ msgid "change the expire date"
+#~ msgstr "更改使用期限"
+
+#~ msgid "set preference list"
+#~ msgstr "设定首选项"
+
+#~ msgid "updated preferences"
+#~ msgstr "更新过的首选项"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "没有索引为 %d 的子钥\n"
+
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key 用户标识"
 
@@ -5775,9 +5904,6 @@ msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 #~ msgid "delphoto"
 #~ msgstr "delphoto"
 
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
 #~ msgid "addcardkey"
 #~ msgstr "addcardkey"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c6e232a59..e60a97ccd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,94 +1,94 @@
 # Traditional Chinese(zh-tw) messages for GnuPG
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# Jedi <[email protected]>, 2003.
+# Jedi <[email protected]>, 2003, 2004.
 # 
 # Special thanks to "Autrijus Tang <[email protected]>".
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.2\n"
+"Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
-"PO-Revision-Date: 2003-05-13 15:48+0800\n"
-"Last-Translator: Jedi <[email protected]>\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
+"PO-Revision-Date: 2005-02-03 03:45+0800\n"
+"Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=BIG5\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: cipher/primegen.c:120
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr ""
+msgstr "無法以 %u 位元長的 p 以及 %u 位元長的 q 產生質數\n"
 
 #: cipher/primegen.c:311
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
-msgstr ""
+msgstr "無法產生少於 %d 位元的質數\n"
 
 #: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr "��������üƻ`���Ҳ�\n"
+msgstr "偵測不到亂數蒐集模組\n"
 
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
 #: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "�L�k�}�� `%s' �G %s\n"
+msgstr "無法開啟 `%s': %s\n"
 
 #: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "�L�k���o�ɮ� `%s' ����T�G %s\n"
+msgstr "無法取得檔案 `%s' 的資訊: %s\n"
 
 #: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' ���O�@�ӼзǪ��ɮ� �w �w���L\n"
+msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
 
 #: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr "�Ъ`�N�G random_seed �ɮ׬O�Ū�\n"
+msgstr "請注意: random_seed 檔案是空的\n"
 
 #: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "ĵ�i�G random_seed �ɮפj�p�L�� �w �����ĥ�\n"
+msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
 
 #: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "�L�kŪ�� `%s' �G %s\n"
+msgstr "無法讀取 `%s': %s\n"
 
 #: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
-msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
+msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "�L�k�إ� `%s' �G %s\n"
+msgstr "無法建立 `%s': %s\n"
 
 #: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "�L�k�g�J `%s' �G %s\n"
+msgstr "無法寫入 `%s': %s\n"
 
 #: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "�L�k���� `%s' �G %s\n"
+msgstr "無法關閉 `%s': %s\n"
 
 #: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ĵ�i�G���b�ϥΤ��w�����H���Ʀr���;��I�I\n"
+msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
 
 #: cipher/random.c:729
 msgid ""
@@ -98,10 +98,10 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"�o���H���Ʀr���;��ڥ��N�O�C���K��X�Ӫ����F��w�w\n"
-"���ڥ��N���O�j�Ӧ��O���üƲ��;��I\n"
+"這個隨機數字產生器根本就是七拼八湊出來的鳥東西 -\n"
+"它根本就不是強而有力的亂數產生器!\n"
 "\n"
-"*** ���藍�n��o�ӵ{�����ͪ������Ʈ��ӥΡI�I ***\n"
+"*** 絕對不要把這個程式產生的任何資料拿來用!! ***\n"
 "\n"
 
 #: cipher/rndegd.c:204
@@ -110,8 +110,8 @@ msgid ""
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
-"�еy�ݤ���A�t�Φ��ɥ��b�`���üơC�p�G�p�|ı�o�L�᪺�ܡA\n"
-"�������ǧO���ơA�o�ˤl�Ʀܯ�����üƪ��~���n�C\n"
+"請稍待片刻, 系統此時正在蒐集亂數. 如果妳會覺得無聊的話,\n"
+"不妨做些別的事, 這樣子甚至能夠讓亂數的品質更好.\n"
 
 #: cipher/rndlinux.c:134
 #, c-format
@@ -121,992 +121,955 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"�H���줸�դ����h�C�Цh���@�Ǧ����S���Ʊ��A\n"
-"�o�˧@�~�t���ׯ�`�����h���üơI(�ٻݭn %d �줸��)\n"
+"隨機位元組不夠多. 請多做一些有的沒的事情, \n"
+"這樣作業系統纔能蒐集到更多的亂數! (還需要 %d 位元組)\n"
 
-#: g10/app-openpgp.c:539
-#, fuzzy, c-format
+#: g10/app-openpgp.c:547
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "�H����Ʈw�ҩl���ѡG %s\n"
+msgstr "存放指紋失敗: %s\n"
 
-#: g10/app-openpgp.c:552
-#, fuzzy, c-format
+#: g10/app-openpgp.c:560
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "���s�إ��_�Ͱ�֨����ѡG %s\n"
+msgstr "存放創生資料失敗: %s\n"
 
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
-#, fuzzy, c-format
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "驗證 CHV %d 失敗: %s\n"
 
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "取用管理者指令尚未被組態過\n"
 
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "卡片已被永久鎖住了!!\n"
 
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
+msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
 
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
 msgid "|A|Admin PIN"
-msgstr ""
+msgstr "|A|Admin PIN"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
-msgstr ""
+msgstr "|AN|New Admin PIN"
 
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
-msgstr ""
+msgstr "|N|New PIN"
 
-#: g10/app-openpgp.c:1025
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1022
+#, c-format
 msgid "error getting new PIN: %s\n"
-msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
+msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
-#, fuzzy
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
 msgid "error reading application data\n"
-msgstr "Ū�����_�϶��ɵo�Ϳ��~�G %s\n"
+msgstr "讀取應用程式資料時出錯\n"
 
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
-#, fuzzy
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
 msgid "error reading fingerprint DO\n"
-msgstr "%s: Ū���ۥѰO���ɿ��~�G %s\n"
+msgstr "讀取指紋 DO 時出錯\n"
 
-#: g10/app-openpgp.c:1107
-#, fuzzy
+#: g10/app-openpgp.c:1104
 msgid "key already exists\n"
-msgstr "`%s' �w�g�Q���Y�F\n"
+msgstr "金鑰已存在\n"
 
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
 msgid "existing key will be replaced\n"
-msgstr ""
+msgstr "既有的金鑰將被取代\n"
 
-#: g10/app-openpgp.c:1113
-#, fuzzy
+#: g10/app-openpgp.c:1110
 msgid "generating new key\n"
-msgstr "���ͤ@���s�����_��"
+msgstr "正在產生新的金鑰\n"
 
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
 msgid "please wait while key is being generated ...\n"
-msgstr ""
+msgstr "公鑰正被產生中, 請稍候 ...\n"
 
-#: g10/app-openpgp.c:1138
-#, fuzzy
+#: g10/app-openpgp.c:1135
 msgid "generating key failed\n"
-msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
+msgstr "產生金鑰時失敗\n"
 
-#: g10/app-openpgp.c:1141
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1138
+#, c-format
 msgid "key generation completed (%d seconds)\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "金鑰產生已完工 (%d 秒)\n"
 
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
 msgid "response does not contain the public key data\n"
-msgstr ""
+msgstr "回應中未包含公鑰資料\n"
 
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
 msgid "response does not contain the RSA modulus\n"
-msgstr ""
+msgstr "回應中未包含 RSA 系數\n"
 
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
 msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+msgstr "回應中未包含 RSA 公用指數\n"
 
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
+msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
 #, c-format
 msgid "signatures created so far: %lu\n"
-msgstr ""
+msgstr "目前建立的簽章: %lu\n"
 
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
 #, c-format
 msgid "PIN [sigs done: %lu]"
-msgstr ""
+msgstr "PIN [簽署完成: %lu]"
 
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
+#, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
+msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 
-#: g10/app-openpgp.c:1734
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1731
+#, c-format
 msgid "error getting serial number: %s\n"
-msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
+msgstr "取得序號時出錯: %s\n"
 
-#: g10/app-openpgp.c:1829
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1826
+#, c-format
 msgid "failed to store the key: %s\n"
-msgstr "�H����Ʈw�ҩl���ѡG %s\n"
+msgstr "存放金鑰失敗: %s\n"
 
-#: g10/app-openpgp.c:1871
-#, fuzzy
+#: g10/app-openpgp.c:1868
 msgid "reading the key failed\n"
-msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
+msgstr "讀取金鑰時失敗\n"
 
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
-msgstr "�ʸˡG %s\n"
+msgstr "封裝: %s\n"
 
 #: g10/armor.c:346
 msgid "invalid armor header: "
-msgstr "�L�Ī��ʸ����Y�G "
+msgstr "無效的封裝檔頭: "
 
 #: g10/armor.c:353
 msgid "armor header: "
-msgstr "�ʸ����Y�G "
+msgstr "封裝檔頭: "
 
 #: g10/armor.c:364
 msgid "invalid clearsig header\n"
-msgstr "�L�Ī�����ñ�����Y\n"
+msgstr "無效的明文簽章檔頭\n"
 
 #: g10/armor.c:416
 msgid "nested clear text signatures\n"
-msgstr "�h�h����ñ��\n"
+msgstr "多層明文簽章\n"
 
 #: g10/armor.c:551
-#, fuzzy
 msgid "unexpected armor: "
-msgstr "���w�����ʸˡG"
+msgstr "未預期的封裝: "
 
 #: g10/armor.c:563
 msgid "invalid dash escaped line: "
-msgstr "�L�Ī��}�鸹�h�X�C�G "
+msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:715 g10/armor.c:1300
-#, fuzzy, c-format
+#: g10/armor.c:715 g10/armor.c:1322
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "�L�Ī� 64 �i��r�� %02x �Q���L�F\n"
+msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
 #: g10/armor.c:758
 msgid "premature eof (no CRC)\n"
-msgstr "�ɮץ��w��������(�S�� CRC ������)\n"
+msgstr "檔案未預期的結束(沒有 CRC 的部分)\n"
 
 #: g10/armor.c:792
 msgid "premature eof (in CRC)\n"
-msgstr "�ɮץ��w��������(CRC ������������)\n"
+msgstr "檔案未預期的結束(CRC 的部分未結束)\n"
 
 #: g10/armor.c:800
 msgid "malformed CRC\n"
-msgstr "CRC �Q�ܳy�L\n"
+msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
-#, fuzzy, c-format
+#: g10/armor.c:804 g10/armor.c:1359
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC ���~�F %06lx - %06lx\n"
+msgstr "CRC 錯誤; %06lX - %06lX\n"
 
 #: g10/armor.c:824
-#, fuzzy
 msgid "premature eof (in trailer)\n"
-msgstr "�ɮץ��w�������� (�󵲧��B)\n"
+msgstr "檔案未預期的結束 (於結尾處)\n"
 
 #: g10/armor.c:828
 msgid "error in trailer line\n"
-msgstr "�����C�����D\n"
+msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1137
 msgid "no valid OpenPGP data found.\n"
-msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
+msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1142
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "�L�Ī��ʸˡG�C���W�X %d �r��\n"
+msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1146
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "�ʸ˸̥X�{�Q�޸��A�����i�C�L�r�� �w �i��O���岫���e�H�{���y����\n"
+msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
-#, fuzzy, c-format
+#: g10/card-util.c:58 g10/card-util.c:283
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "�L�k���Ψp�_"
+msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
 #: g10/card-util.c:63
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
-msgstr "�L�k�b�妸�Ҧ������˰�\n"
+msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
 msgid "Your selection? "
-msgstr "�p�n����@�ӡH "
+msgstr "妳要選哪一個? "
 
 #: g10/card-util.c:194 g10/card-util.c:244
 msgid "[not set]"
-msgstr ""
+msgstr "[未設定]"
 
-#: g10/card-util.c:378
-#, fuzzy
+#: g10/card-util.c:379
 msgid "male"
-msgstr "enable"
+msgstr "男性"
 
-#: g10/card-util.c:379
-#, fuzzy
+#: g10/card-util.c:380
 msgid "female"
-msgstr "enable"
+msgstr "女性"
 
-#: g10/card-util.c:379
-#, fuzzy
+#: g10/card-util.c:380
 msgid "unspecified"
-msgstr "�����w��]"
+msgstr "未特定"
 
-#: g10/card-util.c:406
-#, fuzzy
+#: g10/card-util.c:407
 msgid "not forced"
-msgstr "���Q�B�z"
+msgstr "不強迫使用"
 
-#: g10/card-util.c:406
+#: g10/card-util.c:407
 msgid "forced"
-msgstr ""
+msgstr "強迫使用"
 
-#: g10/card-util.c:458
+#: g10/card-util.c:485
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "錯誤: 目前祇允許使用單純的 ASCII 字元.\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:487
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "錯誤: 不能使用 \"<\" 字元.\n"
 
-#: g10/card-util.c:462
+#: g10/card-util.c:489
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:479
+#: g10/card-util.c:506
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:481
+#: g10/card-util.c:508
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "卡片持有者的教名: "
 
-#: g10/card-util.c:499
+#: g10/card-util.c:526
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:521
-#, fuzzy
+#: g10/card-util.c:548
 msgid "URL to retrieve public key: "
-msgstr "�S���۹��������_�G %s\n"
+msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:529
+#: g10/card-util.c:556
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "Ū�� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/card-util.c:630
+#: g10/card-util.c:657
 msgid "Login data (account name): "
-msgstr ""
+msgstr " 登入資料 (帳號名稱): "
 
-#: g10/card-util.c:640
+#: g10/card-util.c:667
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr ""
+msgstr "錯誤: 登入資料太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:699
+#: g10/card-util.c:726
 msgid "Private DO data: "
-msgstr ""
+msgstr "私人的 PO 資料: "
 
-#: g10/card-util.c:709
+#: g10/card-util.c:736
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr ""
+msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:729
-#, fuzzy
+#: g10/card-util.c:756
 msgid "Language preferences: "
-msgstr "��s�L�����n"
+msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:737
-#, fuzzy
+#: g10/card-util.c:764
 msgid "Error: invalid length of preference string.\n"
-msgstr "���n�]�w�r��̦��L�Ī��r��\n"
+msgstr "錯誤: 偏好設定字串的長度無效\n"
 
-#: g10/card-util.c:746
-#, fuzzy
+#: g10/card-util.c:773
 msgid "Error: invalid characters in preference string.\n"
-msgstr "���n�]�w�r��̦��L�Ī��r��\n"
+msgstr "錯誤: 偏好設定字串中含有無效的字元\n"
 
-#: g10/card-util.c:767
+#: g10/card-util.c:794
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "性別 ((M)ale, (F)emale 或留空): "
 
-#: g10/card-util.c:781
-#, fuzzy
+#: g10/card-util.c:808
 msgid "Error: invalid response.\n"
-msgstr "���~�G�L�Ī�����\n"
+msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:802
-#, fuzzy
+#: g10/card-util.c:829
 msgid "CA fingerprint: "
-msgstr "��ܫ���"
+msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:825
-#, fuzzy
+#: g10/card-util.c:852
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "���~�G�L�Ī�����\n"
+msgstr "錯誤: 指紋格式化無效.\n"
 
-#: g10/card-util.c:873
-#, fuzzy, c-format
+#: g10/card-util.c:900
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:874
-#, fuzzy
+#: g10/card-util.c:901
 msgid "not an OpenPGP card"
-msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
+msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:883
-#, fuzzy, c-format
+#: g10/card-util.c:910
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: g10/card-util.c:966
+#: g10/card-util.c:993
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
+"請注意個人識別碼 (PIN) 的出廠設定值為\n"
+"   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
+"妳應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1056
-#, fuzzy
+#: g10/card-util.c:1083
 msgid "Please select the type of key to generate:\n"
-msgstr "�п�ܩp�n�ϥΪ����_�����G\n"
+msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1058 g10/card-util.c:1138
-#, fuzzy
+#: g10/card-util.c:1085 g10/card-util.c:1165
 msgid "   (1) Signature key\n"
-msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1059 g10/card-util.c:1140
-#, fuzzy
+#: g10/card-util.c:1086 g10/card-util.c:1167
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (�ȯ�[�K��)\n"
+msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
 msgid "Invalid selection.\n"
-msgstr "�L�Ī���ܡC\n"
+msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1135
-#, fuzzy
+#: g10/card-util.c:1162
 msgid "Please select where to store the key:\n"
-msgstr "�п�ܺM�P����]�G\n"
+msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1170
-#, fuzzy
+#: g10/card-util.c:1197
 msgid "unknown key protection algorithm\n"
-msgstr "�������O�@�t��k\n"
+msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1175
-#, fuzzy
+#: g10/card-util.c:1202
 msgid "secret parts of key are not available\n"
-msgstr "�D�_���p�_�����S��k���ΡC\n"
+msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1180
-#, fuzzy
+#: g10/card-util.c:1207
 msgid "secret key already stored on a card\n"
-msgstr "�w���L�G�p�_�w�g�s�b\n"
+msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
 msgid "quit this menu"
-msgstr "���}�o�ӿ��"
+msgstr "離開這個選單"
 
-#: g10/card-util.c:1252
-#, fuzzy
+#: g10/card-util.c:1279
 msgid "show admin commands"
-msgstr "���O�����٬�\n"
+msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
 msgid "show this help"
-msgstr "��ܳo���u�W����"
+msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1255
-#, fuzzy
+#: g10/card-util.c:1282
 msgid "list all available data"
-msgstr "�S���i������"
+msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
 msgid "change card holder's name"
-msgstr ""
+msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "變更要取回金鑰的 URL"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1261
-#, fuzzy
+#: g10/card-util.c:1288
 msgid "change the login name"
-msgstr "���ϥδ���"
+msgstr "變更登入姓名"
 
-#: g10/card-util.c:1262
-#, fuzzy
+#: g10/card-util.c:1289
 msgid "change the language preferences"
-msgstr "���D�[�H��"
+msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
 msgid "change card holder's sex"
-msgstr ""
+msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1264
-#, fuzzy
+#: g10/card-util.c:1291
 msgid "change a CA fingerprint"
-msgstr "��ܫ���"
+msgstr "變更某個憑證中心 (CA) 指紋"
 
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:1266
-#, fuzzy
+#: g10/card-util.c:1293
 msgid "generate new keys"
-msgstr "���ͤ@���s�����_��"
+msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
 msgid "menu to change or unblock the PIN"
-msgstr ""
+msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
 msgid "Command> "
-msgstr "���O> "
+msgstr "指令> "
 
-#: g10/card-util.c:1368
-#, fuzzy
+#: g10/card-util.c:1395
 msgid "Admin-only command\n"
-msgstr "���O�����٬�\n"
+msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1384
-#, fuzzy
+#: g10/card-util.c:1411
 msgid "Admin commands are allowed\n"
-msgstr "���O�����٬�\n"
+msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1386
-#, fuzzy
+#: g10/card-util.c:1413
 msgid "Admin commands are not allowed\n"
-msgstr "���b�N�p�_�g�� `%s'\n"
+msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
 msgid "Invalid command  (try \"help\")\n"
-msgstr "�L�Ī����O  (�ոլ� \"help\")\n"
+msgstr "無效的指令  (試試看 \"help\")\n"
 
 #: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
+"請移除現用中的卡片並插入下列序號的卡片:\n"
+"   %.*s\n"
 
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
 msgid "Enter New Admin PIN: "
-msgstr ""
+msgstr "請輸入新的管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
 msgid "Enter New PIN: "
-msgstr ""
+msgstr "請輸入新的個人識別碼 (PIN): "
 
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "請輸入管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
 msgid "Enter PIN: "
-msgstr ""
+msgstr "請輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:704
-#, fuzzy
+#: g10/cardglue.c:705
 msgid "Repeat this PIN: "
-msgstr "�ЦA��J�@���K�X��G "
+msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:718
-#, fuzzy
+#: g10/cardglue.c:719
 msgid "PIN not correctly repeated; try again"
-msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
+msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "�L�k�}�� `%s'\n"
+msgstr "無法開啟 `%s'\n"
 
 #: g10/decrypt.c:104 g10/encode.c:859
 msgid "--output doesn't work for this command\n"
-msgstr "--output �b�o�өR�O���S���@��\n"
+msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
 #: g10/revoke.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "�䤣�� `%s' ���_�G %s\n"
+msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "Ū�����_�϶��ɵo�Ϳ��~�G %s\n"
+msgstr "讀取金鑰區塊時發生錯誤: %s\n"
 
 #: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(���D�p�������w�F���_)\n"
+msgstr "(除非妳用指紋指定了金鑰)\n"
 
 #: g10/delkey.c:127
-#, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "�b�妸�Ҧ����A�S�� \"--yes\" �N�S��k�o��\n"
+msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
 
 #: g10/delkey.c:139
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "�n�q�_�Ͱ�̧R���o����_�ܡH "
+msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
 
 #: g10/delkey.c:147
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "�o�O�@��p�_�I �w �u���n�R���ܡH "
+msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 
 #: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
+msgstr "刪除金鑰區塊時失敗了: %s\n"
 
 #: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
-msgstr "�D�[�H����T�w�g�Q�M��\n"
+msgstr "主觀信任資訊已經被清除\n"
 
 #: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "���_ \"%s\" ���۹������p�_�I\n"
+msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 
 #: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "�Х��H \"--delete-secret-keys\" �ﶵ�ӧR�����C\n"
+msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
 #: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
+msgstr "建立密語的時候發生錯誤: %s\n"
 
 #: g10/encode.c:215
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "�]���B�� S2K �Ҧ��U�ӵL�k�ϥι�٦� ESK �ʥ]\n"
+msgstr "因為處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
 #: g10/encode.c:228
-#, fuzzy, c-format
+#, c-format
 msgid "using cipher %s\n"
-msgstr "ñ�p�ɥ��ѤF�G %s\n"
+msgstr "正在使用編密法 %s\n"
 
 #: g10/encode.c:238 g10/encode.c:558
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "`%s' �w�g�Q���Y�F\n"
+msgstr "`%s' 已經被壓縮了\n"
 
 #: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "ĵ�i�G `%s' �O�@�Ӫ��ɮ�\n"
+msgstr "警告： `%s' 是一個空檔案\n"
 
 #: g10/encode.c:472
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "�b --pgp2 �Ҧ����A�p���H 2048 �줸�H�U�� RSA ���_�[�K\n"
+msgstr "在 --pgp2 模式中，妳祇能以 2048 位元以下的 RSA 金鑰加密\n"
 
 #: g10/encode.c:494
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "���b�q `%s' Ū����\n"
+msgstr "正在從 `%s' 讀取中\n"
 
 #: g10/encode.c:530
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "�p���n�Ψӥ[�K���Ҧ����_������ϥ� IDEA �s�K�k�C\n"
+msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
 #: g10/encode.c:540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
+msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
 #: g10/encode.c:648 g10/sign.c:877
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
-msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
+msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
 
 #: g10/encode.c:735
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
+msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
 #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
 #, c-format
 msgid "you may not use %s while in %s mode\n"
-msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 
 #: g10/encode.c:832
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s �w�g�[�K���G \"%s\"\n"
+msgstr "%s/%s 已經加密給: \"%s\"\n"
 
 #: g10/encr-data.c:66 g10/mainproc.c:301
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s �[�K�L�����\n"
+msgstr "%s 加密過的資料\n"
 
 #: g10/encr-data.c:68 g10/mainproc.c:305
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "�H�������t��k %d �[�K�L\n"
+msgstr "以未知的演算法 %d 加密過\n"
 
 #: g10/encr-data.c:92
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "ĵ�i�G�T���Q�H��٦��s�K�k���z���_�[�K�F�C\n"
+msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
 
 #: g10/encr-data.c:103
 msgid "problem handling encrypted packet\n"
-msgstr "�B�z�[�K���ʥ]�����D\n"
+msgstr "處理加密的封包有問題\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
-msgstr "�S���w�䴩�����ݵ{������\n"
+msgstr "沒有已支援的遠端程式執行\n"
 
 #: g10/exec.c:184 g10/openfile.c:406
 #, c-format
 msgid "can't create directory `%s': %s\n"
-msgstr "�L�k�إߥؿ� `%s': %s\n"
+msgstr "無法建立目錄 `%s': %s\n"
 
 #: g10/exec.c:325
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
-msgstr "�]�����w�����ɮ��v���ﶵ�A�ӸT�ΤF�~���{���s��\n"
+msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
 #: g10/exec.c:355
-#, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
-msgstr "�b�o�ӧ@�~���x�W�s�Υ~���{���ɻݭn�Ȧs��\n"
+msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 
 #: g10/exec.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "�L�k���� %s \"%s\": %s\n"
+msgstr "無法執行程式 `%s': %s\n"
 
 #: g10/exec.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr "�L�k���� %s \"%s\": %s\n"
+msgstr "無法執行 shell `%s': %s\n"
 
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
-msgstr "�s�Υ~���{���ɵo�ͨt�ο��~�G %s\n"
+msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
 #: g10/exec.c:532 g10/exec.c:598
 msgid "unnatural exit of external program\n"
-msgstr "�~���{�����۵M�a���}\n"
+msgstr "外部程式不自然地離開\n"
 
 #: g10/exec.c:547
 msgid "unable to execute external program\n"
-msgstr "�L�k����~���{��\n"
+msgstr "無法執行外部程式\n"
 
 #: g10/exec.c:563
 #, c-format
 msgid "unable to read external program response: %s\n"
-msgstr "�L�kŪ���~���{���^���G %s\n"
+msgstr "無法讀取外部程式回應: %s\n"
 
 #: g10/exec.c:609 g10/exec.c:616
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
-msgstr "ĵ�i�G�L�k�����Ȧs�� (%s) `%s': %s\n"
+msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
 
 #: g10/exec.c:621
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
-msgstr "ĵ�i�G�L�k�����Ȧs�ؿ� `%s': %s\n"
+msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
-#: g10/export.c:182
-#, fuzzy
+#: g10/export.c:183
 msgid "exporting secret keys not allowed\n"
-msgstr "���b�N�p�_�g�� `%s'\n"
+msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:211
-#, fuzzy, c-format
+#: g10/export.c:212
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "���_ %08lX: ���Q�O�@ �w �w���L\n"
+msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:219
-#, fuzzy, c-format
+#: g10/export.c:220
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "���_ %08lX: PGP 2.x �˦������_ �w �w���L\n"
+msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
-#: g10/export.c:384
-#, fuzzy, c-format
+#: g10/export.c:395
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "�Чi�G�p�_ %08lX �èS���������@ SK �[�`�ˬd\n"
+msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:416
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
-msgstr "ĵ�i�G�S���ץX����F��\n"
+msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/g10.c:358
+#: g10/g10.c:360
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
-"@���O�G\n"
+"@指令:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "|[file]|make a signature"
-msgstr "|[�ɮ�]|�إߤ@��ñ��"
+msgstr "|[檔案]|建立一份簽章"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "|[file]|make a clear text signature"
-msgstr "|[�ɮ�]|�إߤ@������ñ��"
+msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "make a detached signature"
-msgstr "�إߤ@��������ñ��"
+msgstr "建立一份分離式簽章"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "encrypt data"
-msgstr "�[�K���"
+msgstr "加密資料"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "encryption only with symmetric cipher"
-msgstr "�Ȩϥι�٦��s�K�k�ӥ[�K"
+msgstr "僅使用對稱式編密法來加密"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "decrypt data (default)"
-msgstr "��ƸѱK(�w�])"
+msgstr "資料解密 (預設)"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "verify a signature"
-msgstr "���ҬY��ñ��"
+msgstr "驗證某份簽章"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "list keys"
-msgstr "�C�X���_"
+msgstr "列出金鑰"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "list keys and signatures"
-msgstr "�C�X���_�Mñ��"
+msgstr "列出金鑰和簽章"
 
-#: g10/g10.c:374
-#, fuzzy
+#: g10/g10.c:376
 msgid "list and check key signatures"
-msgstr "�ˬd���_ñ��"
+msgstr "列出並檢查金鑰簽章"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "list keys and fingerprints"
-msgstr "�C�X���_�M����"
+msgstr "列出金鑰和指紋"
 
-#: g10/g10.c:376
+#: g10/g10.c:378
 msgid "list secret keys"
-msgstr "�C�X�p�_"
+msgstr "列出私鑰"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "generate a new key pair"
-msgstr "���ͤ@���s�����_��"
+msgstr "產生一份新的金鑰對"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "remove keys from the public keyring"
-msgstr "�q���_�_�Ͱ�̲��h���_"
+msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "remove keys from the secret keyring"
-msgstr "�q�p�_�_�Ͱ�̲��h���_"
+msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "sign a key"
-msgstr "ñ�p�Y����_"
+msgstr "簽署某把金鑰"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "sign a key locally"
-msgstr "�Ȧb���añ�p�Y����_"
+msgstr "僅在本地簽署某把金鑰"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "sign or edit a key"
-msgstr "ñ�p�νs��Y����_"
+msgstr "簽署或編輯某把金鑰"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "generate a revocation certificate"
-msgstr "���ͤ@���M�P����"
+msgstr "產生一份撤銷憑證"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "export keys"
-msgstr "�ץX���_"
+msgstr "匯出金鑰"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "export keys to a key server"
-msgstr "����_�ץX�ܬY�Ӫ��_���A���W"
+msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/g10.c:388
+#: g10/g10.c:390
 msgid "import keys from a key server"
-msgstr "�q�Y�Ӫ��_���A���W�פJ���_"
+msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "search for keys on a key server"
-msgstr "�b�Y�Ӫ��_���A���W�j�M���_"
+msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/g10.c:392
+#: g10/g10.c:394
 msgid "update all keys from a keyserver"
-msgstr "�q�Y�Ӫ��_���A���W��s�Ҧ������_"
+msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/g10.c:395
+#: g10/g10.c:397
 msgid "import/merge keys"
-msgstr "�פJ/�X�֪��_"
+msgstr "匯入/合併金鑰"
 
-#: g10/g10.c:398
+#: g10/g10.c:400
 msgid "print the card status"
-msgstr ""
+msgstr "列印卡片狀態"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "change data on a card"
-msgstr ""
+msgstr "變更卡片上的資料"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "change a card's PIN"
-msgstr ""
+msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/g10.c:408
+#: g10/g10.c:410
 msgid "update the trust database"
-msgstr "��s�H����Ʈw"
+msgstr "更新信任資料庫"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "|algo [files]|print message digests"
-msgstr "|�t��k [�ɮ�]|�L�X�T���K�n"
+msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
 msgid ""
 "@\n"
 "Options:\n"
 " "
 msgstr ""
 "@\n"
-"�ﶵ�G\n"
+"選項:\n"
 " "
 
-#: g10/g10.c:421
+#: g10/g10.c:423
 msgid "create ascii armored output"
-msgstr "�إߥH ASCII �ʸ˹L����X"
+msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/g10.c:423
+#: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
-msgstr "|�W�r|�H�u�W�r�v�@���[�K��H"
+msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
-msgstr "�ϥγo�ӨϥΪ� ID ��ñ�p�θѱK"
+msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/g10.c:435
+#: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|�]�w���Y���Ŭ� N (0 ���ܤ����Y)"
+msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/g10.c:440
+#: g10/g10.c:442
 msgid "use canonical text mode"
-msgstr "�ϥμзǪ���r�Ҧ�"
+msgstr "使用標準的文字模式"
 
-#: g10/g10.c:450
+#: g10/g10.c:452
 msgid "use as output file"
-msgstr "���@��X�ɮרӨϥ�"
+msgstr "當作輸出檔案來使用"
 
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
 msgid "verbose"
-msgstr "�o���Ҧ�"
+msgstr "囉唆模式"
 
-#: g10/g10.c:463
+#: g10/g10.c:465
 msgid "do not make any changes"
-msgstr "���n���������"
+msgstr "不要做任何改變"
 
-#: g10/g10.c:464
+#: g10/g10.c:466
 msgid "prompt before overwriting"
-msgstr "�мg�e���߰�"
+msgstr "覆寫前先詢問"
 
-#: g10/g10.c:505
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/g10.c:506
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/g10.c:532
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 "@\n"
-"(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
+"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/g10.c:535
+#: g10/g10.c:539
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1118,574 +1081,562 @@ msgid ""
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 "@\n"
-"�d�ҡG\n"
+"範例:\n"
 "\n"
-" -se -r Bob [�ɮ�]          �� Bob �o�ӨϥΪ�ñ�p�Υ[�K\n"
-" --clearsign [�ɮ�]         ���X����ñ��\n"
-" --detach-sign [�ɮ�]       ���X������ñ��\n"
-" --list-keys [�W�r]         ��ܪ��_\n"
-" --fingerprint [�W�r]       ��ܫ���\n"
+" -se -r Bob [檔案]          對 Bob 這個使用者簽署及加密\n"
+" --clearsign [檔案]         做出明文簽章\n"
+" --detach-sign [檔案]       做出分離式簽章\n"
+" --list-keys [名字]         顯示金鑰\n"
+" --fingerprint [名字]       顯示指紋\n"
 
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
 msgid "Please report bugs to <[email protected]>.\n"
-msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
+msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/g10.c:733
+#: g10/g10.c:737
 msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/g10.c:736
+#: g10/g10.c:740
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
-"�y�k�G gpg [�ﶵ] [�ɮ�]\n"
-"ñ�p�B�ˬd�B�[�K�θѱK\n"
-"�w�]���ާ@�|�̿�J��Ʀөw\n"
+"語法: gpg [選項] [檔案]\n"
+"簽署, 檢查, 加密或解密\n"
+"預設的操作會依輸入資料而定\n"
 
-#: g10/g10.c:747
+#: g10/g10.c:751
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 "\n"
-"�w�Q�䴩���t��k�G\n"
+"已被支援的演算法:\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:754
 msgid "Pubkey: "
-msgstr "���_�G "
+msgstr "公鑰: "
 
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
 msgid "Cipher: "
-msgstr "�s�K�k�G "
+msgstr "編密法: "
 
-#: g10/g10.c:762
+#: g10/g10.c:766
 msgid "Hash: "
-msgstr "����G "
+msgstr "雜湊: "
 
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
 msgid "Compression: "
-msgstr "���Y�G "
+msgstr "壓縮: "
 
-#: g10/g10.c:851
+#: g10/g10.c:855
 msgid "usage: gpg [options] "
-msgstr "�Ϊk�G gpg [�ﶵ] "
+msgstr "用法: gpg [選項] "
 
-#: g10/g10.c:999
+#: g10/g10.c:1003
 msgid "conflicting commands\n"
-msgstr "���O�����٬�\n"
+msgstr "指令彼此矛盾\n"
 
-#: g10/g10.c:1017
-#, fuzzy, c-format
+#: g10/g10.c:1021
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
+msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/g10.c:1214
-#, fuzzy, c-format
+#: g10/g10.c:1218
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
+msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1217
-#, fuzzy, c-format
+#: g10/g10.c:1221
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
+msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1220
-#, fuzzy, c-format
+#: g10/g10.c:1224
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
+msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1226
-#, fuzzy, c-format
+#: g10/g10.c:1230
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
+msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1229
-#, fuzzy, c-format
+#: g10/g10.c:1233
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
+msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1232
-#, fuzzy, c-format
+#: g10/g10.c:1236
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
+msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1238
-#, fuzzy, c-format
+#: g10/g10.c:1242
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
+msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1241
-#, fuzzy, c-format
+#: g10/g10.c:1245
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
+msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1244
-#, fuzzy, c-format
+#: g10/g10.c:1248
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
+msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1250
-#, fuzzy, c-format
+#: g10/g10.c:1254
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
+msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1253
-#, fuzzy, c-format
+#: g10/g10.c:1257
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
+msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1256
-#, fuzzy, c-format
+#: g10/g10.c:1260
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
+msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1397
-#, fuzzy, c-format
+#: g10/g10.c:1401
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "�s���]�w�� `%s' �Q�إߤF\n"
+msgstr "未知的組態項目 `%s'\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1796
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
+msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1838
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
+msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1842
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "�ﶵ�� `%s' �G %s\n"
+msgstr "選項檔 `%s': %s\n"
 
-#: g10/g10.c:1851
+#: g10/g10.c:1849
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "�q `%s' Ū���ﶵ\n"
+msgstr "從 `%s' 讀取選項\n"
 
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
-msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
+msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/g10.c:2078
-#, fuzzy, c-format
+#: g10/g10.c:2076
+#, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
+msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/g10.c:2292
-#, fuzzy, c-format
+#: g10/g10.c:2293
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s ���O�@�Ӧ��Ī��r����\n"
+msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/g10.c:2311 g10/keyedit.c:3498
-#, fuzzy
+#: g10/g10.c:2312 g10/keyedit.c:3573
 msgid "could not parse keyserver URL\n"
-msgstr "�L�k���R���_���A�� URI\n"
+msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/g10.c:2317
-#, fuzzy, c-format
+#: g10/g10.c:2318
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
+msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/g10.c:2320
-#, fuzzy
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
-msgstr "�L�Ī��ץX�ﶵ\n"
+msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/g10.c:2327
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
+msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/g10.c:2330
+#: g10/g10.c:2331
 msgid "invalid import options\n"
-msgstr "�L�Ī��פJ�ﶵ\n"
+msgstr "無效的匯入選項\n"
 
-#: g10/g10.c:2337
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
+msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2341
 msgid "invalid export options\n"
-msgstr "�L�Ī��ץX�ﶵ\n"
+msgstr "無效的匯出選項\n"
 
-#: g10/g10.c:2347
-#, fuzzy, c-format
+#: g10/g10.c:2348
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
+msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/g10.c:2350
-#, fuzzy
+#: g10/g10.c:2351
 msgid "invalid list options\n"
-msgstr "�L�Ī��פJ�ﶵ\n"
+msgstr "無效的清單選項\n"
 
-#: g10/g10.c:2372
-#, fuzzy, c-format
+#: g10/g10.c:2373
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
+msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/g10.c:2375
-#, fuzzy
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
-msgstr "�L�Ī��ץX�ﶵ\n"
+msgstr "無效的驗證選項\n"
 
-#: g10/g10.c:2382
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr "�L�k������ɸ��|�]�� %s\n"
+msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/g10.c:2572
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
-msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
+msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/g10.c:2576
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
+msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/g10.c:2585
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s ���Q���\�� %s �֥�\n"
+msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/g10.c:2588
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
+msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "因為 %s 而不會在不安全的記憶體中執行"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2617
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
+msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2623
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "�p�b --pgp2 �Ҧ��U�ɡA����P��ñ�p�M�[�K\n"
+msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/g10.c:2628
+#: g10/g10.c:2629
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
+msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/g10.c:2641
+#: g10/g10.c:2642
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\n"
+msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
 msgid "selected cipher algorithm is invalid\n"
-msgstr "�ҿ諸�s�K�t��k�L��\n"
+msgstr "所選的編密演算法無效\n"
 
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
 msgid "selected digest algorithm is invalid\n"
-msgstr "�ҿ諸�K�n�t��k�L��\n"
+msgstr "所選的摘要演算法無效\n"
 
-#: g10/g10.c:2723
-#, fuzzy
+#: g10/g10.c:2724
 msgid "selected compression algorithm is invalid\n"
-msgstr "�ҿ諸�s�K�t��k�L��\n"
+msgstr "所選的壓縮演算法無效\n"
 
-#: g10/g10.c:2729
+#: g10/g10.c:2730
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
+msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2745
 msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed �@�w�n�j�� 0\n"
+msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2747
 msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed �@�w�n�j�� 1\n"
+msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/g10.c:2748
-#, fuzzy
+#: g10/g10.c:2749
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
+msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/g10.c:2750
-#, fuzzy
+#: g10/g10.c:2751
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
+msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/g10.c:2752
-#, fuzzy
+#: g10/g10.c:2753
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
+msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/g10.c:2755
+#: g10/g10.c:2756
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
+msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/g10.c:2759
+#: g10/g10.c:2760
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
+msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/g10.c:2766
+#: g10/g10.c:2767
 msgid "invalid default preferences\n"
-msgstr "�L�Ī��w�]���n\n"
+msgstr "無效的預設偏好\n"
 
-#: g10/g10.c:2775
+#: g10/g10.c:2776
 msgid "invalid personal cipher preferences\n"
-msgstr "�L�Ī��ӤH�s�K�k���n\n"
+msgstr "無效的個人編密法偏好\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2780
 msgid "invalid personal digest preferences\n"
-msgstr "�L�Ī��ӤH�K�n���n\n"
+msgstr "無效的個人摘要偏好\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2784
 msgid "invalid personal compress preferences\n"
-msgstr "�L�Ī��ӤH���Y���n\n"
+msgstr "無效的個人壓縮偏好\n"
 
-#: g10/g10.c:2816
-#, fuzzy, c-format
+#: g10/g10.c:2817
+#, c-format
 msgid "%s does not yet work with %s\n"
-msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
+msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/g10.c:2863
-#, fuzzy, c-format
+#: g10/g10.c:2864
+#, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2868
-#, fuzzy, c-format
+#: g10/g10.c:2869
+#, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2873
-#, fuzzy, c-format
+#: g10/g10.c:2874
+#, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2969
+#: g10/g10.c:2970
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "�H����Ʈw�ҩl���ѡG %s\n"
+msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/g10.c:2980
+#: g10/g10.c:2981
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
+msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/g10.c:2991
+#: g10/g10.c:2992
 msgid "--store [filename]"
-msgstr "--store [�ɦW]"
+msgstr "--store [檔名]"
 
-#: g10/g10.c:2998
+#: g10/g10.c:2999
 msgid "--symmetric [filename]"
-msgstr "--symmetric [�ɦW]"
+msgstr "--symmetric [檔名]"
 
-#: g10/g10.c:3000
-#, fuzzy, c-format
+#: g10/g10.c:3001
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "�ѱK���ѡG %s\n"
+msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/g10.c:3010
+#: g10/g10.c:3011
 msgid "--encrypt [filename]"
-msgstr "--encrypt [�ɦW]"
+msgstr "--encrypt [檔名]"
 
-#: g10/g10.c:3023
-#, fuzzy
+#: g10/g10.c:3024
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [�ɦW]"
+msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/g10.c:3025
+#: g10/g10.c:3026
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/g10.c:3028
-#, fuzzy, c-format
+#: g10/g10.c:3029
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/g10.c:3046
+#: g10/g10.c:3047
 msgid "--sign [filename]"
-msgstr "--sign [�ɦW]"
+msgstr "--sign [檔名]"
 
-#: g10/g10.c:3059
+#: g10/g10.c:3060
 msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [�ɦW]"
+msgstr "--sign --encrypt [檔名]"
 
-#: g10/g10.c:3074
-#, fuzzy
+#: g10/g10.c:3075
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [�ɦW]"
+msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/g10.c:3076
+#: g10/g10.c:3077
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/g10.c:3079
-#, fuzzy, c-format
+#: g10/g10.c:3080
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/g10.c:3099
+#: g10/g10.c:3100
 msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [�ɦW]"
+msgstr "--sign --symmetric [檔名]"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 msgid "--clearsign [filename]"
-msgstr "--clearsign [�ɦW]"
+msgstr "--clearsign [檔名]"
 
-#: g10/g10.c:3133
+#: g10/g10.c:3134
 msgid "--decrypt [filename]"
-msgstr "--decrypt [�ɦW]"
+msgstr "--decrypt [檔名]"
 
-#: g10/g10.c:3141
+#: g10/g10.c:3142
 msgid "--sign-key user-id"
-msgstr "--sign-key �ϥΪ�ID"
+msgstr "--sign-key 使用者ID"
 
-#: g10/g10.c:3145
+#: g10/g10.c:3146
 msgid "--lsign-key user-id"
-msgstr "--lsign-key �ϥΪ�ID"
+msgstr "--lsign-key 使用者ID"
 
-#: g10/g10.c:3166
+#: g10/g10.c:3167
 msgid "--edit-key user-id [commands]"
-msgstr "--edit-key �ϥΪ�ID [���O]"
+msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/g10.c:3237
+#: g10/g10.c:3238
 msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
+msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/g10.c:3274
-#, fuzzy, c-format
+#: g10/g10.c:3275
+#, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/g10.c:3276
-#, fuzzy, c-format
+#: g10/g10.c:3277
+#, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/g10.c:3278
-#, fuzzy, c-format
+#: g10/g10.c:3279
+#, c-format
 msgid "key export failed: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/g10.c:3289
-#, fuzzy, c-format
+#: g10/g10.c:3290
+#, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/g10.c:3299
-#, fuzzy, c-format
+#: g10/g10.c:3300
+#, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "��s�p�_���ѡG %s\n"
+msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/g10.c:3340
+#: g10/g10.c:3341
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
+msgstr "解開封裝失敗: %s\n"
 
-#: g10/g10.c:3348
+#: g10/g10.c:3349
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "�i��ʸ˥��ѡG %s\n"
+msgstr "進行封裝失敗: %s\n"
 
-#: g10/g10.c:3435
+#: g10/g10.c:3436
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "�L�Ī� `%s' ����t��k\n"
+msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/g10.c:3558
+#: g10/g10.c:3559
 msgid "[filename]"
-msgstr "[�ɦW]"
+msgstr "[檔名]"
 
-#: g10/g10.c:3562
+#: g10/g10.c:3563
 msgid "Go ahead and type your message ...\n"
-msgstr "�ж}�l��J�p���T�� ...\n"
+msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/g10.c:3852
+#: g10/g10.c:3853
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
-msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v�ӵ���\n"
+msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/g10.c:3860
+#: g10/g10.c:3861
 msgid "a user notation name must contain the '@' character\n"
-msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
+msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 
-#: g10/g10.c:3870
+#: g10/g10.c:3871
 msgid "a notation value must not use any control characters\n"
-msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
+msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3904
+#: g10/g10.c:3905
 msgid "the given certification policy URL is invalid\n"
-msgstr "���w�������ҭ�h URL �L��\n"
+msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/g10.c:3906
+#: g10/g10.c:3907
 msgid "the given signature policy URL is invalid\n"
-msgstr "���w����h URL �L��\n"
+msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/g10.c:3939
-#, fuzzy
+#: g10/g10.c:3940
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "���w����h URL �L��\n"
+msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
 #: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "pk �֨��̦��Ӧh���� �w �w�T��\n"
+msgstr "pk 快取裡有太多項目 ─ 已禁用\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2711
-#, fuzzy
+#: g10/getkey.c:186 g10/getkey.c:2749
 msgid "[User ID not found]"
-msgstr "[�䤣��ϥΪ� ID]"
+msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:1639
-#, fuzzy, c-format
+#: g10/getkey.c:1677
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "--allow-non-selfsigned-uid �����L�Ī����_ %08lX �ͮ�\n"
+msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2189
-#, fuzzy, c-format
+#: g10/getkey.c:2227
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "���_ %08lX �S���۹������p�_ �w ���b����\n"
+msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
 #, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
-msgstr "���b�ϥΦ��_ %08lX �Ӵ����D�_ %08lX\n"
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2467
-#, fuzzy, c-format
+#: g10/getkey.c:2505
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "���_ %08lX: �馳�p�_�ӨS�����_ �w �w���L\n"
+msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
 msgid "be somewhat more quiet"
-msgstr "�ɶq�w�R��"
+msgstr "盡量安靜些"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
 msgid "take the keys from this keyring"
-msgstr "�q�o���_�Ͱ�̨��Ϊ��_"
+msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
 msgid "make timestamp conflicts only a warning"
-msgstr "�ȧ�ɶ��W�L�٬޵���ĵ�i"
+msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
 msgid "|FD|write status info to this FD"
-msgstr "|�ɮ״y�z|�⪬�A��T�g�J���ɮ״y�z"
+msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
 msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "�Ϊk�G gpgv [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
+msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
-"�y�k�G gpg [�ﶵ] [�ɮ�]\n"
-"�Τw�������H�����_���ˬdñ��\n"
+"語法: gpg [選項] [檔案]\n"
+"用已知的受信任金鑰來檢查簽章\n"
 
 #: g10/helptext.c:48
 msgid ""
@@ -1693,8 +1644,8 @@ msgid ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"�b�o�̫������ƭȧ����O�ݩp�ۤv�M�w�F�o�Ǽƭȥû����|�Q�ץX����L�H�C\n"
-"�ڭ̻ݭn���ӹ�I�H�������F�o��]�۰ʫإ߰_���^���Һ����@�I���Y�]�S���C"
+"在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
+"我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
 
 #: g10/helptext.c:54
 msgid ""
@@ -1703,18 +1654,18 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
-"�n�إ߰_�H�������AGnuPG �ݭn���D���Ǫ��_�O�Q�����H���� �w \n"
-"���Ǫ��_�q�`�N�O�p����k�s����p�_���C�^�� \"yes\" �ӱN�o��\n"
-"���_�]���Q�����H����\n"
+"要建立起信任網絡, GnuPG 需要知道哪些金鑰是被徹底信任的 -\n"
+"那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
+"金鑰設成被徹底信任的\n"
 
 #: g10/helptext.c:61
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "�p�G�p�L�צp��Q�n�ϥγo�⥼�Q�H�������_�A�Ц^�� \"yes\"�C"
+msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"yes\"."
 
 #: g10/helptext.c:65
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "��J�p�n���e���T�������̪��ϥΪ� ID�C"
+msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
 
 #: g10/helptext.c:69
 msgid ""
@@ -1729,6 +1680,16 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"請選擇要使用的演算法.\n"
+"\n"
+"DSA (亦即 DSS) 是數位簽章演算法 (Digital Signature Algorithm),\n"
+"祇能用於簽署.\n"
+"\n"
+"Elgamal 是祇能用於加密的演算法.\n"
+"\n"
+"RSA 可以被用來簽署及加密.\n"
+"\n"
+"第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
 
 #: g10/helptext.c:83
 msgid ""
@@ -1736,18 +1697,18 @@ msgid ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
-"�q�`�ӻ��ΦP�@����_ñ�p�Υ[�K�ä��O�Ӧn�D�N�C\n"
-"�o�Ӻt��k���Ӭ�Q�Ω�S�w�����p�U�C\n"
-"���p���p���w���M�a�C"
+"通常來說用同一把金鑰簽署及加密並不是個好主意.\n"
+"這個演算法應該祇被用於特定的情況下.\n"
+"請先聯絡妳的安全專家。"
 
 #: g10/helptext.c:90
 msgid "Enter the size of the key"
-msgstr "�п�J���_���ؤo"
+msgstr "請輸入金鑰的尺寸"
 
 #: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
 #: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
 msgid "Answer \"yes\" or \"no\""
-msgstr "�Ц^�� \"yes\" �� \"no\""
+msgstr "請回答 \"yes\" 或 \"no\""
 
 #: g10/helptext.c:104
 msgid ""
@@ -1756,21 +1717,21 @@ msgid ""
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"�п�J���ܸ̩ҭn�D���ƭȡC\n"
-"�p�i�H��J ISO ����榡 (YYYY-MM-DD)�A���O���|�o��}�n�����~�^���w\n"
-"�Ϥ��A�t�η|�յۧ⵹�w���ƭȤ��_���Y�z���q�C"
+"請輸入提示裡所要求的數值.\n"
+"妳可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
+"反之, 系統會試著把給定的數值中斷成若干片段."
 
 #: g10/helptext.c:116
 msgid "Enter the name of the key holder"
-msgstr "�п�J���_�����H���W�r"
+msgstr "請輸入金鑰持有人的名字"
 
 #: g10/helptext.c:121
 msgid "please enter an optional but highly suggested email address"
-msgstr "�п�J��Ρ]���j�P��ij�ϥΡ^���q�l�l���}"
+msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
 
 #: g10/helptext.c:125
 msgid "Please enter an optional comment"
-msgstr "�п�J��Ϊ�����"
+msgstr "請輸入選用的註釋"
 
 #: g10/helptext.c:130
 msgid ""
@@ -1780,15 +1741,15 @@ msgid ""
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 msgstr ""
-"N  �ק�m�W�C\n"
-"C  �ק�����C\n"
-"E  �ק�q�l�l���}�C\n"
-"O  �~�򲣥ͪ��_�C\n"
-"Q  ����ͪ��_�C"
+"N  修改姓名.\n"
+"C  修改註釋.\n"
+"E  修改電子郵件位址.\n"
+"O  繼續產生金鑰.\n"
+"Q  中止產生金鑰."
 
 #: g10/helptext.c:139
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "�p�G�pı�o���ͤl�_�i�H���ܡA�N�^�� \"yes\" (�Ϊ̬�n \"y\") �C"
+msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
 
 #: g10/helptext.c:147
 msgid ""
@@ -1830,51 +1791,50 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"���p�b�Y����_�Wñ�p�Y�ӨϥΪ� ID �A�p�������������Ҩ���\n"
-"���_�T���ݩ󨺭ӨϥΪ� ID �W�s���ӦW�r���H�C�o�墨�Ǫ��D\n"
-"�p�h�p�����Ҫ��H�ӻ��ܦ��ΡC\n"
+"當妳在某把金鑰上簽署某個使用者 ID ，妳首先必須先驗證那把\n"
+"金鑰確實屬於那個使用者 ID 上叫那個名字的人. 這對那些知道\n"
+"妳多小心驗證的人來說很有用.\n"
 "\n"
-"\"0\" ���ܩp���ണ�X����S�O���D�i�Ӫ���\n"
-"    �p�h�J�����Ҩ�����_\n"
+"\"0\" 表示妳不能提出任何特別的主張來表明\n"
+"    妳多仔細驗證那把金鑰\n"
 "\n"
-"\"1\" ���ܩp�۫H�o����_�ݩ󨺭ӥD�i�O�D�H���H�A\n"
-"    ���O�p����ΨS�����Ҩ�����_�C\n"
-"    �o�墨�Ǭ�Q�n�u�ӤH���v���Ҫ��H�ӻ��ܦ��ΡA\n"
-"    �]���pñ�p�F�@�������ΦW�ϥΪ̪����_�C\n"
+"\"1\" 表示妳相信這把金鑰屬於那個主張是主人的人,\n"
+"    但是妳不能或沒有驗證那把金鑰.\n"
+"    這對那些祇想要 \"個人的\" 驗證的人來說很有用,\n"
+"    因為妳簽署了一把擬似匿名使用者的金鑰.\n"
 "\n"
-"\"2\" ���ܩp�u���J�����ҤF������_�C\n"
-"    �Ҧp���A�o����ܩp���ҤF�o����_�������M\n"
-"    �ϥΪ� ID �A�ä��F�Ӥ� ID �C\n"
+"\"2\" 表示妳真的仔細驗證了那把金鑰.\n"
+"    例如說, 這能表示妳驗證了這把金鑰的指紋和\n"
+"    使用者 ID, 並比對了照片 ID.\n"
 "\n"
-"\"3\" ���ܩp�u�����F�j�W�Ҫ����Ҫ��_�u�@�C\n"
-"    �Ҧp���A�o����ܩp�V���_�����H���ҤF���_�����A\n"
-"    �ӥB�p�z�L���a�Ӥ������H���y����� (���O�@��) \n"
-"    �T�{�F���_�����H���m�W�P���_�W�ϥΪ� ID ���@�P�A\n"
-"    �̫�p�� (�z�L�q�l�l�󩹨�) ���ҤF���_�W��\n"
-"    �q�l�l���}�T���ݩ���_�����H�C\n"
+"\"3\" 表示妳真的做了大規模的驗證金鑰工作.\n"
+"    例如說, 這能表示妳向金鑰持有人驗證了金鑰指紋,\n"
+"    而且妳透過附帶照片而難以偽造的文件 (像是護照) \n"
+"    確認了金鑰持有人的姓名與金鑰上使用者 ID 的一致,\n"
+"    最後妳還 (透過電子郵件往來) 驗證了金鑰上的\n"
+"    電子郵件位址確實屬於金鑰持有人.\n"
 "\n"
-"�Ъ`�N�W�z���󵥯� 2 �M 3 ���Ҥl�u��O�v�Ҥl�Ӥw�C\n"
-"�̫�A�٬O�o�ѩp�ۤv�M�w���pñ�p��L���_�ɡA\n"
-"�ƻ�O�u�����g�ߡv�A�Ӭƻ�O�u�W���ԷV�v�C\n"
+"請注意上述關於等級 2 和 3 的例子 \"祇是\" 例子而已.\n"
+"最後, 還是得由妳自己決定當妳簽署其他金鑰時,\n"
+"甚麼是 \"漫不經心\", 而甚麼是 \"超級謹慎\".\n"
 "\n"
-"�p�G�p�����D���ӿ�ƻ򵪮ת��ܡA�N�� \"0\" �C"
+"如果妳不知道應該選甚麼答案的話, 就選 \"0\"."
 
 #: g10/helptext.c:185
-#, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "�p�G�p�Q�nñ�p *�Ҧ�* �ϥΪ� ID ���ܴN�� \"yes\""
+msgstr "如果妳想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
 
 #: g10/helptext.c:189
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
-"�p�G�p�u���Q�n�R���o�ӨϥΪ� ID ���ܴN�^�� \"yes\" �C\n"
-"�Ҧ������Ҧb������]���|���h�I"
+"如果妳真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
+"所有的憑證在那之後也都會失去!"
 
 #: g10/helptext.c:194
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "�p�G�R���o��l�_�S���D���ܴN�^�� \"yes\""
+msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
 
 #: g10/helptext.c:199
 msgid ""
@@ -1882,9 +1842,9 @@ msgid ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"�o�O�@���b�o����_�W���Ī�ñ���F�q�`�p���|�Q�n�R���o��ñ���A\n"
-"�]���n��O�����_�إ߰_�H���s���A�Υѳo����_��ñ�p�����_����\n"
-"�|�O�@��۷����n���ơC"
+"這是一份在這把金鑰上有效的簽章; 通常妳不會想要刪除這份簽章,\n"
+"因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
+"會是一件相當重要的事."
 
 #: g10/helptext.c:204
 msgid ""
@@ -1893,15 +1853,15 @@ msgid ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"�o��ñ���L�k�Q����A�]���p�S���ŦX�����_�C�p���ө��w�R�����A\n"
-"����p���D���@����_�Q�ϥΤF�F�]���o���ñ�p�����_�i��z�L\n"
-"��L�w�g���Ҫ����_�إߤF�@�ӫH���s���C"
+"這份簽章無法被檢驗, 因為妳沒有符合的金鑰. 妳應該延緩刪除它,\n"
+"直到妳知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
+"其他已經驗證的金鑰建立了一個信任連結."
 
 #: g10/helptext.c:210
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "�o��ñ���S���ġC�⥦�q�p���_�Ͱ�̲��h�۷��X�z�C"
+msgstr "這份簽章並非有效. 把它從妳的鑰匙圈裡移去相當合理."
 
 #: g10/helptext.c:214
 msgid ""
@@ -1911,11 +1871,11 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"�o�O�@���M�o�Ӫ��_�ϥΪ� ID ��ô��ñ���C�q�`\n"
-"��o�˪�ñ���������|�O�Ӧn�I�l�C�ƹ�W GnuPG \n"
-"�i��q���N����A�ϥγo����_�F�C�ҥH�馳�b�o\n"
-"����_���Ĥ@�Ӧۧ�ñ���]�Y�ǭ�]�L�ġA�ӲĤG\n"
-"���٥i�Ϊ����p�U�׳o�򰵡C"
+"這是一份和這個金鑰使用者 ID 相繫的簽章. 通常\n"
+"把這樣的簽章移除不會是個好點子. 事實上 GnuPG \n"
+"可能從此就不能再使用這把金鑰了. 所以祇有在這\n"
+"把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
+"個還可用的情況下纔這麼做."
 
 #: g10/helptext.c:222
 msgid ""
@@ -1923,32 +1883,32 @@ msgid ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"�ܧ�Ҧ��]�ά馳�Q��������X�ӡ^�ϥΪ� ID �����n���{�Ϊ����n�M��C\n"
-"�Ҧ�����v�T���ۧ�ñ�����ɶ��W�O���|�W�[�@�����C\n"
+"變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
+"所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
 
 #: g10/helptext.c:229
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "�п�J�K�X��F�o�O�@�ӯ��K���y�l \n"
+msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
 #: g10/helptext.c:235
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "�ЦA����J�̫᪺�K�X��A�H�T�w�p�쩳��i�F�Ǭƻ�C"
+msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
 
 #: g10/helptext.c:239
 msgid "Give the name of the file to which the signature applies"
-msgstr "�е��wñ���ҭn�M�Ϊ��ɮצW��"
+msgstr "請給定簽章所要套用的檔案名稱"
 
 #: g10/helptext.c:244
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "�p�G�мg�o���ɮרS�����D���ܴN�^�� \"yes\""
+msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
 
 #: g10/helptext.c:249
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"�п�J�@�ӷs���ɦW�C�p�G�p�������U�F Enter �A����\n"
-"�N�|�ϥιw�]���ɮ� (��ܦb�A����) �C"
+"請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
+"就會使用預設的檔案 (顯示在括號中)."
 
 #: g10/helptext.c:255
 msgid ""
@@ -1965,18 +1925,18 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
-"�p���Ӭ��o�����ҫ��w�@�ӭ�]�C\n"
-"�ھڱ��Ҫ����P�A�p���ӥi�H�q�o�ӲM�椤��X�@���G\n"
-"  \"���_�w�g�Q���|�F\"\n"
-"      �p�G�p�۫H���Y�ӥ��g�\�i���å���o�F�p���p�_���ܡA\n"
-"      �N��o�ӡC\n"
-"  \"���_�Q�N���F\"\n"
-"      �p�G�p��p�����_�����s���F�A�N��o�ӡC\n"
-"  \"���_���A�Q�ϥΤF\"\n"
-"      �p�G�p�w�g�M�^�F�o����_�A�N��o��\n"
-"  \"�ϥΪ� ID ���A���ĤF\"\n"
-"      �p�G�o�ӨϥΪ� ID ���A�Q�ϥΤF�A�N��o�ӡF\n"
-"      �o�q�`�ΨӪ��ܬY�ӹq�l�l���}���A���ĤF�C\n"
+"妳應該為這份憑證指定一個原因.\n"
+"根據情境的不同，妳應該可以從這個清單中選出一項:\n"
+"  \"金鑰已經被洩漏了\"\n"
+"      如果妳相信有某個未經許可的傢伙取得了妳的私鑰的話,\n"
+"      就選這個.\n"
+"  \"金鑰被代換了\"\n"
+"      如果妳把妳的金鑰換成新的了, 就選這個.\n"
+"  \"金鑰不再被使用了\"\n"
+"      如果妳已經撤回了這把金鑰, 就選這個.\n"
+"  \"使用者 ID 不再有效了\"\n"
+"      如果這個使用者 ID 不再被使用了, 就選這個;\n"
+"      這通常用來表示某個電子郵件位址不再有效了.\n"
 
 #: g10/helptext.c:271
 msgid ""
@@ -1984,1502 +1944,1533 @@ msgid ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
-"�p�]�i�H��J�@���r�Ӵy�z���ƻ�o�G�o���M�P���Ҫ��z�ѡC\n"
-"�����o�q��r�O��²����n�C\n"
-"��J�ťզC�H�����o�q��r�C\n"
+"妳也可以輸入一串文字來描述為甚麼發佈這份撤銷憑證的理由.\n"
+"請讓這段文字保持簡明扼要.\n"
+"鍵入空白列以結束這段文字.\n"
 
 #: g10/helptext.c:286
 msgid "No help available"
-msgstr "�S���i������"
+msgstr "沒有可用的說明"
 
 #: g10/helptext.c:294
 #, c-format
 msgid "No help available for `%s'"
-msgstr "`%s' �S���i������"
+msgstr "`%s' 沒有可用的說明"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "���b���L %d ���A���϶�\n"
+msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:258
-#, fuzzy, c-format
+#: g10/import.c:259
+#, c-format
 msgid "%lu keys processed so far\n"
-msgstr "�w�� %lu ����_�Q�B�z�F\n"
+msgstr "已有 %lu 把金鑰被處理了\n"
 
-#: g10/import.c:275
+#: g10/import.c:276
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "�`�@�Q�B�z���ƶq�G %lu\n"
+msgstr "總共被處理的數量: %lu\n"
 
-#: g10/import.c:277
+#: g10/import.c:278
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "       �w���L���s���_�G %lu\n"
+msgstr "       已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:281
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "      �S���ϥΪ̪� ID�G %lu\n"
+msgstr "      沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:282
+#: g10/import.c:283
 #, c-format
 msgid "              imported: %lu"
-msgstr "               �w�פJ�G %lu"
+msgstr "               已匯入: %lu"
 
-#: g10/import.c:288
+#: g10/import.c:289
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "             �����ܪ��G %lu\n"
+msgstr "             未改變的: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:291
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "        �s���ϥΪ� ID�G %lu\n"
+msgstr "        新的使用者 ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:293
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "             �s���l�_�G %lu\n"
+msgstr "             新的子鑰: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:295
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "             �s���G %lu\n"
+msgstr "             新的簽章: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:297
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "         �s�����_�M�P�G %lu\n"
+msgstr "         新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:299
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "         �QŪ�����p�_�G %lu\n"
+msgstr "         被讀取的私鑰: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:301
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "         �w�פJ���p�_�G %lu\n"
+msgstr "         已匯入的私鑰: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:303
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "         �����ܪ��p�_�G %lu\n"
+msgstr "         未改變的私鑰: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:305
 #, c-format
 msgid "          not imported: %lu\n"
-msgstr "             ���Q�פJ�G %lu\n"
+msgstr "             未被匯入: %lu\n"
 
-#: g10/import.c:545
+#: g10/import.c:546
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
-#: g10/import.c:547
-#, fuzzy
+#: g10/import.c:548
 msgid "algorithms on these user IDs:\n"
-msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
+msgstr "這些使用者 ID 上的演算法:\n"
 
-#: g10/import.c:584
+#: g10/import.c:585
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
+#: g10/import.c:597
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "%s �A�K�n�t��k %s\n"
+msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:608
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:621
+#: g10/import.c:622
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:623
+#: g10/import.c:624
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
-msgstr ""
+msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:647
+#: g10/import.c:648
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr ""
+msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:695 g10/import.c:1049
-#, fuzzy, c-format
+#: g10/import.c:696 g10/import.c:1050
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "���_ %08lX: �S���ϥΪ� ID\n"
+msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:715
-#, fuzzy, c-format
+#: g10/import.c:716
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "���_ %08lX: HKP �l�_���_�~�w�Q�״_\n"
+msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:730
-#, fuzzy, c-format
+#: g10/import.c:731
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "���_ %08lX: �D�ۧ�ñ�p���ϥΪ� ID `%s' �w�Q����\n"
+msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:736
-#, fuzzy, c-format
+#: g10/import.c:737
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "���_ %08lX: �S�����Ī��ϥΪ� ID\n"
+msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:738
+#: g10/import.c:739
 msgid "this may be caused by a missing self-signature\n"
-msgstr "�o�i��O�ѩ�򥢦ۧ�ñ���ҾɭP����G\n"
+msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:748 g10/import.c:1170
-#, fuzzy, c-format
+#: g10/import.c:749 g10/import.c:1171
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "���_ %08lX: �䤣�줽�_�G %s\n"
+msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:754
-#, fuzzy, c-format
+#: g10/import.c:755
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "���_ %08lX: �s���_ �w �w���L\n"
+msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:763
+#: g10/import.c:764
 #, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "�䤣��i�g���_�Ͱ�G %s\n"
+msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "���b�g�� `%s'\n"
+msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "�g���_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:793
-#, fuzzy, c-format
+#: g10/import.c:794
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "���_ %08lX: ���_ \"%s\" �w�Q�פJ\n"
+msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:817
-#, fuzzy, c-format
+#: g10/import.c:818
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "���_ %08lX: ��ڭ̪��ƥ����k�X\n"
+msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:834 g10/import.c:1188
-#, fuzzy, c-format
+#: g10/import.c:835 g10/import.c:1189
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "���_ %08lX: �L�k�w���l�����_�϶��G %s\n"
+msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:842 g10/import.c:1195
-#, fuzzy, c-format
+#: g10/import.c:843 g10/import.c:1196
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "���_ %08lX: �L�kŪ����l�����_�϶��G %s\n"
+msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:874
-#, fuzzy, c-format
+#: g10/import.c:875
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "���_ %08lX: \"%s\" 1 �ӷs���ϥΪ� ID\n"
+msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:877
-#, fuzzy, c-format
+#: g10/import.c:878
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "���_ %08lX: \"%s\" %d �ӷs���ϥΪ� ID\n"
+msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:880
-#, fuzzy, c-format
+#: g10/import.c:881
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "���_ %08lX: \"%s\" 1 �ӷs��ñ��\n"
+msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:883
-#, fuzzy, c-format
+#: g10/import.c:884
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "���_ %08lX: \"%s\" %d �ӷs��ñ��\n"
+msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:886
-#, fuzzy, c-format
+#: g10/import.c:887
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "���_ %08lX: \"%s\" 1 �ӷs���l�_\n"
+msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:889
-#, fuzzy, c-format
+#: g10/import.c:890
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "���_ %08lX: \"%s\" %d �ӷs���l�_\n"
+msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:910
-#, fuzzy, c-format
+#: g10/import.c:911
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "���_ %08lX: \"%s\" �S���Q����\n"
+msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1055
-#, fuzzy, c-format
+#: g10/import.c:1056
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "���_ %08lX: �p�_�ϥΤF�L�Ī��s�K�k %d �w �w���L\n"
+msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1066
-#, fuzzy
+#: g10/import.c:1067
 msgid "importing secret keys not allowed\n"
-msgstr "���b�N�p�_�g�� `%s'\n"
+msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
 #, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "�S���w�]���p�_�_�Ͱ�G %s\n"
+msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1094
-#, fuzzy, c-format
+#: g10/import.c:1095
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "���_ %08lX: �p�_�Q�פJ�F\n"
+msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1123
-#, fuzzy, c-format
+#: g10/import.c:1124
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "���_ %08lX: �w�g�b�p�_�_�Ͱ餤�F\n"
+msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1133
-#, fuzzy, c-format
+#: g10/import.c:1134
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "���_ %08lX: �䤣��p�_�G %s\n"
+msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1163
-#, fuzzy, c-format
+#: g10/import.c:1164
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr "���_ %08lX: �S�����_ �w �L�k�M�κM�P����\n"
+msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1206
-#, fuzzy, c-format
+#: g10/import.c:1207
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w��^\n"
+msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1238
-#, fuzzy, c-format
+#: g10/import.c:1239
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "���_ %08lX: \"%s\" �M�P���Ҥw�Q�פJ\n"
+msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1303
-#, fuzzy, c-format
+#: g10/import.c:1304
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "���_ %08lX: ñ���S���ϥΪ� ID\n"
+msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1319
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "���_ %08lX: �ϥΪ� ID \"%s\" �ϥΤF���Q�䴩�����}���_�t��k\n"
+msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1320
-#, fuzzy, c-format
+#: g10/import.c:1321
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "���_ %08lX: �ϥΪ� ID \"%s\" ���L�Ī��ۧ�ñ��\n"
+msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1338
-#, fuzzy, c-format
+#: g10/import.c:1339
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
+msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1349 g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1350 g10/import.c:1400
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "���_ %08lX: ���Q�䴩�����}���_�t��k\n"
+msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1351
-#, fuzzy, c-format
+#: g10/import.c:1352
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "���_ %08lX: �L�Ī����a�l�_\n"
+msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1366
-#, fuzzy, c-format
+#: g10/import.c:1367
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "���_ %08lX: �h�����a�l�_�w�Q����\n"
+msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1388
-#, fuzzy, c-format
+#: g10/import.c:1389
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "���_ %08lX: �S���l�_�i�Ѫ��_�M�P\n"
+msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1401
-#, fuzzy, c-format
+#: g10/import.c:1402
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "���_ %08lX: �L�Ī��l�_�M�P\n"
+msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1416
-#, fuzzy, c-format
+#: g10/import.c:1417
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "���_ %08lX: �h���l�_�M�P�w����\n"
+msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1458
-#, fuzzy, c-format
+#: g10/import.c:1459
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "���_ %08lX: �w���L�ϥΪ� ID '"
+msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1479
-#, fuzzy, c-format
+#: g10/import.c:1480
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "���_ %08lX: �l�_�w���L\n"
+msgstr "金鑰 %s: 子鑰已跳過\n"
 
-#: g10/import.c:1506
-#, fuzzy, c-format
+#: g10/import.c:1507
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "���_ %08lX: ���i�ץX��ñ�� (���� %02x) �w �w���L\n"
+msgstr "金鑰 %s: 不可匯出的簽章 (等級 %02X) - 已跳過\n"
 
-#: g10/import.c:1516
-#, fuzzy, c-format
+#: g10/import.c:1517
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "���_ %08lX: �M�P���Ҧb���~���a�� �w �w���L\n"
+msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1533
-#, fuzzy, c-format
+#: g10/import.c:1534
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w���L\n"
+msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1547
-#, fuzzy, c-format
+#: g10/import.c:1548
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "���_ %08lX: �l�_�b���~���a�� �w �w���L\n"
+msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1555
-#, fuzzy, c-format
+#: g10/import.c:1556
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "���_ %08lX: �D�w�������� (0x%02X) �w �w���L\n"
+msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1655
+#: g10/import.c:1577
 #, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
+
+#: g10/import.c:1680
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "���_ %08lX: �����쭫�ƪ��ϥΪ� ID �w �w�X��\n"
+msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1717
-#, fuzzy, c-format
+#: g10/import.c:1742
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G���b���^�M�P���_ %08lX\n"
+msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1731
-#, fuzzy, c-format
+#: g10/import.c:1756
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G�M�P���_ %08lX ���X�{�C\n"
+msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1790
-#, fuzzy, c-format
+#: g10/import.c:1815
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "���_ %08lX: �w�s�W�M�P���� \"%s\"\n"
+msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1824
-#, fuzzy, c-format
+#: g10/import.c:1849
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "���_ %08lX: �w�s�W�������_ñ��\n"
+msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
+
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "公鑰與私鑰並不吻合!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "私鑰已經存放於卡片上了\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "私鑰已經存放於卡片上了\n"
 
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "�إ��_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
 #: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "�_�Ͱ� `%s' �w�إ�\n"
+msgstr "鑰匙圈 `%s' 已建立\n"
 
 #: g10/keydb.c:685
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "���s�إ��_�Ͱ�֨����ѡG %s\n"
+msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
 msgid "[revocation]"
-msgstr "[�M�P]"
+msgstr "[撤銷]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
 msgid "[self-signature]"
-msgstr "[�ۧ�ñ��]"
+msgstr "[自我簽章]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
 msgid "1 bad signature\n"
-msgstr "1 �ӷl�a��ñ��\n"
+msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "%d �ӷl�a��ñ��\n"
+msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
 msgid "1 signature not checked due to a missing key\n"
-msgstr "�� 1 ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
+msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
-msgstr "�� %d ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
+msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
 msgid "1 signature not checked due to an error\n"
-msgstr "�� 1 ��ñ���]���Y�ӿ��~�ӥ��Q�ˬd\n"
+msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "�� %d ��ñ���]���Y�ǿ��~�ӥ��Q�ˬd\n"
+msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "������ 1 �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
+msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "������ %d �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
+msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
-#, fuzzy
+#: g10/keyedit.c:403 g10/pkclist.c:262
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 msgstr ""
-"�p���h�H���o��ϥΪ����Ҩ�L�ϥΪ̪����_�]�d�鶴���ҡB\n"
-"�q���P���a���ˬd������...�^����O�O�H\n"
-"\n"
+"請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
+"(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
-#, fuzzy, c-format
+#: g10/keyedit.c:407 g10/pkclist.c:274
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = �ګj�j�H��\n"
+msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/keyedit.c:408 g10/pkclist.c:276
+#, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = �ڧ����H��\n"
+msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"請輸入此信任簽章的深度.\n"
+"深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
+"同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr ""
+msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
+msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "�p���M�Q�nñ�p���ܡH (y/N) "
+msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
 msgid "  Unable to sign.\n"
-msgstr "  �L�kñ�p�C\n"
+msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:610
-#, fuzzy, c-format
+#: g10/keyedit.c:611
+#, c-format
 msgid "User ID \"%s\" is expired."
-msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
+msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:636
-#, fuzzy, c-format
+#: g10/keyedit.c:637
+#, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "ĵ�i�G�ϥΪ� ID \"%s\" ���g�ۧ�ñ�p�C\n"
+msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"\"%s\" �̪��ۧ�ñ��\n"
-"�O PGP 2.x ���A���C\n"
+"\"%s\" 裡的自我簽章\n"
+"是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "�p�O�_�Q�n�N���ɯŦ� OpenPGP �ۧ�ñ���H (y/N) "
+msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
-"�p�ثe�b \"%s\" ��ñ��\n"
-"�w�g�L���F�C\n"
+"妳目前在 \"%s\" 的簽章\n"
+"已經過期了.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "�p�Q�n�o�G�@���s��ñ���Ө��N�w�L�������@�ӶܡH (y/N) "
+msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
-"�p�ثe�b \"%s\" ��ñ��\n"
-"�O�@�����a�C\n"
+"妳目前在 \"%s\" 的簽章\n"
+"是一份本地簽章.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "�p�O�_�Q�n��L�ɯŦ��i�H�����ץX��ñ���H (y/N) "
+msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:748
-#, fuzzy, c-format
+#: g10/keyedit.c:749
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" �w�g�Q���_ %08lX �b���añ�p�F\n"
+msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:751
-#, fuzzy, c-format
+#: g10/keyedit.c:752
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" �w�g�Q���_ %08lX ñ�p�F\n"
+msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "�p���M�Q�n�A��ñ�p���ܡH (y/N) "
+msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:778
-#, fuzzy, c-format
+#: g10/keyedit.c:779
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "�S���F��i�H�����_ %08lX ñ�p\n"
+msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
 msgid "This key has expired!"
-msgstr "�o����_�w�g�L���F�I"
+msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "�o����_�N�b %s �L���C\n"
+msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "�p�Q�n���p��ñ���]�b�P�@�ӮɭԹL���ܡH (Y/n) "
+msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
-msgstr "�p����b --pgp2 �Ҧ��U�A�� PGP 2.x ���_���X OpenPGP ñ���C\n"
+msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "�o�|���o����_�b PGP 2.x �Ҧ��U���i�ϥΡC\n"
+msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"�p���h�ԷV�ˬd���nñ�p�����_�T���ݩ�W�����ӤH���W�r�O�H\n"
-"�p�G�p�����D�o�Ӱ��D�����סA�п�J�u0�v�C\n"
+"妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
+"如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr "   (0) �ڤ��@���C %s\n"
+msgstr "   (0) 我不作答. %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr "   (1) �ڮڥ��S���ˬd�L�C %s\n"
+msgstr "   (1) 我根本沒有檢查過. %s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr "   (2) ���H�N�ˬd�L�F�C %s\n"
+msgstr "   (2) 我隨意檢查過了. %s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr "   (3) �ګD�`�p�ߦa�ˬd�L�F�C %s\n"
+msgstr "   (3) 我非常小心地檢查過了. %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
 msgid "Your selection? (enter `?' for more information): "
-msgstr ""
+msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:918
-#, fuzzy, c-format
+#: g10/keyedit.c:919
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
-"�p�u���T�w�nñ�p�o����_\n"
-"�Ωp�����_�G \""
+"妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
+"來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:925
-#, fuzzy
+#: g10/keyedit.c:926
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"�o�N�|�O�ۧ�ñ���C\n"
+msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:931
-#, fuzzy
+#: g10/keyedit.c:932
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"ĵ�i�G�o��ñ�����|�Q�аO�����i�ץX�C\n"
+msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:939
-#, fuzzy
+#: g10/keyedit.c:940
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"ĵ�i�G�o��ñ�����|�Q�аO�����i�M�P�C\n"
+msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:949
-#, fuzzy
+#: g10/keyedit.c:950
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"�o��ñ���|�Q�аO�����i�ץX�C\n"
+msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:956
-#, fuzzy
+#: g10/keyedit.c:957
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"�o��ñ���|�Q�аO�����i�M�P�C\n"
+msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:963
-#, fuzzy
+#: g10/keyedit.c:964
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"�ڮڥ��S���ˬd�L�o����_�C\n"
+msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:968
-#, fuzzy
+#: g10/keyedit.c:969
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"���H�N�ˬd�L�o����_�F�C\n"
+msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:973
-#, fuzzy
+#: g10/keyedit.c:974
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"�ګD�`�p�ߦa�ˬd�L�o����_�F�C\n"
+msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:983
-#, fuzzy
+#: g10/keyedit.c:984
 msgid "Really sign? (y/N) "
-msgstr "�u���nñ�p�ܡH "
+msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "ñ�p�ɥ��ѤF�G %s\n"
+msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
 msgid "This key is not protected.\n"
-msgstr "�o����_�S���Q�O�@�C\n"
+msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
 msgid "Secret parts of primary key are not available.\n"
-msgstr "�D�_���p�_�����S��k���ΡC\n"
+msgstr "主鑰的私鑰部分沒辦法取用.\n"
+
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1117 g10/keygen.c:3063
 msgid "Key is protected.\n"
-msgstr "���_�Q�O�@�F�C\n"
+msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
 #, c-format
 msgid "Can't edit this key: %s\n"
-msgstr "�L�k�s��o����_�G %s\n"
+msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"��J�n���o��p�_���s�K�X��C\n"
+"輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
 msgid "passphrase not correctly repeated; try again"
-msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
+msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"�p���Q�n�αK�X�� �w �o�j���O�� *�V* �I�l�I\n"
+"妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1135
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "Do you really want to do this? (y/N) "
-msgstr "�p�u���Q�n�o�򰵶ܡH "
+msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
 msgid "moving a key signature to the correct place\n"
-msgstr "���b����_��ñ���h���쥿�T����m�h\n"
+msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
 msgid "save and quit"
-msgstr "�x�s�����}"
+msgstr "儲存並離開"
 
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
-msgstr "��ܫ���"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
+msgstr "顯示指紋"
 
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
 msgid "list key and user IDs"
-msgstr "�C�X���_�M�ϥΪ� ID"
+msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
 msgid "select user ID N"
-msgstr "�ϥΪ� ID ��F N"
+msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "��ܦ��_ N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "�C�Xñ��"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "撤銷簽章"
 
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "ñ�p���_"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
 
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
-msgstr "�Ȧb���añ�p���_"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
+msgstr "僅在本地簽署金鑰"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "提示: 選擇要簽署的使用者 ID\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
 msgid "add a user ID"
-msgstr "�W�[�@�ӨϥΪ� ID"
+msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
 msgid "add a photo ID"
-msgstr "�W�[�@�ӷӤ� ID"
+msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1305
-msgid "delete user ID"
-msgstr "�R���@�ӨϥΪ� ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
+msgstr "刪除一個使用者 ID"
 
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "�W�[�@�⦸�_"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
-msgstr "�R���@�⦸�_"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
+msgstr "刪除一把次鑰"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
 msgid "add a revocation key"
-msgstr "�W�[�@��M�P���_"
+msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "�R��ñ��"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "���ϥδ���"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
-msgstr "��ϥΪ� ID �аO���D�n"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
+msgstr "把使用者 ID 標記為主要"
 
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
-msgstr "��p�_�M���_�M��ô�b�@�_"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
+msgstr "把私鑰和公鑰清單繫在一起"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
 msgid "list preferences (expert)"
-msgstr "�C�X���n (�M�a�Ҧ�)"
+msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
 msgid "list preferences (verbose)"
-msgstr "�C�X���n (�o���Ҧ�)"
+msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "�]�w���n�M��"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "��s�L�����n"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
 #, fuzzy
-msgid "set preferred keyserver URL"
-msgstr "�L�k���R���_���A�� URI\n"
+msgid "set preferred keyserver URL for the selected user IDs"
+msgstr "設定偏好的金鑰伺服器 URI"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "change the passphrase"
-msgstr "���K�X��"
+msgstr "更改密語"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
 msgid "change the ownertrust"
-msgstr "���D�[�H��"
+msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "�M�Pñ��"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
-msgstr "�M�P�@�ӨϥΪ� ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
+msgstr "撤銷一個使用者 ID"
 
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
-msgstr "�M�P�@�⦸�_"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
+msgstr "撤銷一把次鑰"
 
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "�T�Τ@����_"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
+msgstr "啟用一把金鑰"
 
-#: g10/keyedit.c:1331
-msgid "enable a key"
-msgstr "�ҥΤ@����_"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "禁用一把金鑰"
 
-#: g10/keyedit.c:1332
-msgid "show photo ID"
-msgstr "��ܷӤ� ID"
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
+msgstr "顯示照片 ID"
 
-#: g10/keyedit.c:1386
-#, fuzzy, c-format
+#: g10/keyedit.c:1431
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "Ū�����_�϶� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
 msgid "Secret key is available.\n"
-msgstr "�p�_�i�ΡC\n"
+msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
 msgid "Need the secret key to do this.\n"
-msgstr "�n���p�_�ׯ�o�򰵡C\n"
+msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
 msgid "Please use the command \"toggle\" first.\n"
-msgstr "�Х��ϥ� \"toggle\" ���O�C\n"
+msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
 msgid "Key is revoked."
-msgstr "���_�w�g�Q�M�P�F�C"
+msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1557
-#, fuzzy
+#: g10/keyedit.c:1610
 msgid "Really sign all user IDs? (y/N) "
-msgstr "�u���nñ�p�Ҧ����ϥΪ� ID �ܡH "
+msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "���ܡG��ܭnñ�p���ϥΪ� ID\n"
+msgstr "提示: 選擇要簽署的使用者 ID\n"
 
-#: g10/keyedit.c:1568
-#, fuzzy, c-format
+#: g10/keyedit.c:1621
+#, c-format
 msgid "Unknown signature type `%s'\n"
-msgstr "�������h��"
+msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr "�b %s �Ҧ��������\�ϥγo�ӫ��O�C\n"
+msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
 msgid "You must select at least one user ID.\n"
-msgstr "�p�ܤֱo��ܤ@�ӨϥΪ� ID �C\n"
+msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
 msgid "You can't delete the last user ID!\n"
-msgstr "�p����R���̫�@�ӨϥΪ� ID �I\n"
+msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1617
-#, fuzzy
+#: g10/keyedit.c:1670
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "�u���n�����Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
+msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1618
-#, fuzzy
+#: g10/keyedit.c:1671
 msgid "Really remove this user ID? (y/N) "
-msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
+msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1668
-#, fuzzy
+#: g10/keyedit.c:1721
 msgid "Really move the primary key? (y/N) "
-msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
+msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1680
-#, fuzzy
+#: g10/keyedit.c:1733
 msgid "You must select exactly one key.\n"
-msgstr "�p�ܤ֥�����ܤ@����_�C\n"
+msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
 msgid "You must select at least one key.\n"
-msgstr "�p�ܤ֥�����ܤ@����_�C\n"
+msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1703
-#, fuzzy
+#: g10/keyedit.c:1756
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "�p�u���Q�n�R���Q��ܪ����_�ܡH "
+msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1704
-#, fuzzy
+#: g10/keyedit.c:1757
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "�p�u���n�R���o����_�ܡH "
+msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1739
-#, fuzzy
+#: g10/keyedit.c:1792
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "�u���n�M�P�Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
+msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1740
-#, fuzzy
+#: g10/keyedit.c:1793
 msgid "Really revoke this user ID? (y/N) "
-msgstr "�u���n�M�P�o�ӨϥΪ� ID �ܡH "
+msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr "�p�u���Q�n�M�P�o�dzQ��ܪ����_�ܡH "
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "妳真的想要撤銷這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1822
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
-msgstr "�p�u���Q�n�M�P�o����_�ܡH "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgstr "妳真的想要撤銷這些被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1824
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
+msgstr "妳真的想要撤銷這把金鑰嗎? (y/N) "
+
+#: g10/keyedit.c:1865
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
-msgstr ""
+msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:1831
-#, fuzzy
+#: g10/keyedit.c:1897
 msgid "Set preference list to:\n"
-msgstr "�]�w���n�M��"
+msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:1837
-#, fuzzy
+#: g10/keyedit.c:1903
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "�u���n��s�Q��ܨϥΪ� ID �����n�ܡH "
+msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:1839
-#, fuzzy
+#: g10/keyedit.c:1905
 msgid "Really update the preferences? (y/N) "
-msgstr "�u���n��s���n�ܡH "
+msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:1889
-#, fuzzy
+#: g10/keyedit.c:1955
 msgid "Save changes? (y/N) "
-msgstr "�n�x�s�ܧ�ܡH "
+msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:1892
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "Quit without saving? (y/N) "
-msgstr "�n���x�s�����}�ܡH "
+msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
 #, c-format
 msgid "update failed: %s\n"
-msgstr "��s���ѡG %s\n"
+msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "��s�p�_���ѡG %s\n"
+msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
 msgid "Key not changed so no update needed.\n"
-msgstr "���_�S���ܧ�ҥH���ݭn��s�C\n"
+msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
 msgid "Digest: "
-msgstr "�K�n�G "
+msgstr "摘要: "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
 msgid "Features: "
-msgstr "�S�I�G "
+msgstr "特點: "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
 #, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
+
+#: g10/keyedit.c:2384
+#, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "�o����_�i��Q %s ���_�M�P�F "
+msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2315
-#, fuzzy
+#: g10/keyedit.c:2390
 msgid "(sensitive)"
-msgstr " �]���K���^"
+msgstr "(機密的)"
 
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
-#, fuzzy, c-format
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
+#, c-format
 msgid "created: %s"
-msgstr "�L�k�إ� %s: %s\n"
+msgstr "建立於: %s"
 
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
-#, fuzzy, c-format
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
+#, c-format
 msgid "revoked: %s"
-msgstr "[�w�M�P]"
+msgstr "已撤銷: %s"
 
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
-#, fuzzy, c-format
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
+#, c-format
 msgid "expired: %s"
-msgstr " [���Ĵ����G %s]"
+msgstr "已過期: %s"
 
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
-#, fuzzy, c-format
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
+#, c-format
 msgid "expires: %s"
-msgstr " [���Ĵ����G %s]"
+msgstr "過期: %s"
 
-#: g10/keyedit.c:2340
-#, fuzzy, c-format
+#: g10/keyedit.c:2415
+#, c-format
 msgid "usage: %s"
-msgstr " �H���G %c/%c"
+msgstr "用法: %s"
 
-#: g10/keyedit.c:2355
-#, fuzzy, c-format
+#: g10/keyedit.c:2430
+#, c-format
 msgid "trust: %s"
-msgstr " �H���G %c/%c"
+msgstr "信任: %s"
 
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "有效性: %s"
 
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
 msgid "This key has been disabled"
-msgstr "�o����_�w�g�Q�T�ΤF"
+msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
 msgid "card-no: "
-msgstr ""
+msgstr "卡片編號: "
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "PGP 2.x ���A���ϥΪ� ID �S�����n�C\n"
+msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
-"�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
-"���D�p���s����{���C\n"
+"請注意顯示出來的金鑰有效性不需要更正,\n"
+"除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
 #: g10/trustdb.c:1164
-#, fuzzy
 msgid "revoked"
-msgstr "[�w�M�P]"
+msgstr "已撤銷"
 
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
 #: g10/trustdb.c:531
-#, fuzzy
 msgid "expired"
-msgstr "expire"
+msgstr "已過期"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
 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"
 msgstr ""
+"警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
+"      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
-"      �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
+"警告: 這是一把 PGP2 型態的金鑰.\n"
+"      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "�p�T�w���M�Q�n�W�[�ܡH (y/N) "
+msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "�p���i�H��Ӥ� ID �W�[�� PGP2 ���A�����_�̡C\n"
+msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
 msgid "Delete this good signature? (y/N/q)"
-msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
+msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
+msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
+msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
 msgid "Really delete this self-signature? (y/N)"
-msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
+msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "�w�g�R���F %d ���C\n"
+msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
 #, c-format
 msgid "Deleted %d signatures.\n"
-msgstr "�w�g�R���F %d ���C\n"
+msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
 msgid "Nothing deleted.\n"
-msgstr "�S���F��Q�R���C\n"
+msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
-"      �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
+"警告: 這是一把 PGP2 型態的金鑰.\n"
+"      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "�p���i�H����w�M�P�̼W�[�� PGP2 ���A�����_�̡C\n"
+msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
 msgid "Enter the user ID of the designated revoker: "
-msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
+msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
+msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3029
-#, fuzzy
+#: g10/keyedit.c:3104
 msgid "this key has already been designated as a revoker\n"
-msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
+msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
+msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3054
-#, fuzzy
+#: g10/keyedit.c:3129
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "�p�T�w�n�����o����_�����w�M�P�̶ܡH (y/N): "
+msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
 msgid "Please remove selections from the secret keys.\n"
-msgstr "�бq�p�_��������ܡC\n"
+msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
-msgstr "�Цܦh��ܤ@�⦸�_�C\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
+msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
-msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
+msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
 msgid "Changing expiration time for the primary key.\n"
-msgstr "���b�ܧ�D�_���ϥδ����C\n"
+msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
 msgid "You can't change the expiration date of a v3 key\n"
-msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
+msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
 msgid "No corresponding signature in secret ring\n"
-msgstr "�b�p�_��̨S���@�P��ñ��\n"
+msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
 msgid "Please select exactly one user ID.\n"
-msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
+msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
-#, fuzzy, c-format
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
+#, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
+msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:3559
-#, fuzzy
+#: g10/keyedit.c:3635
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "�p�T�w�n�Υ��ܡH (y/N) "
+msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:3560
-#, fuzzy
+#: g10/keyedit.c:3636
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "�p�T�w�n�Υ��ܡH (y/N) "
+msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "���� %d �S���ϥΪ� ID\n"
-
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "���� %d �S�����_\n"
+msgstr "索引 %d 沒有使用者 ID\n"
 
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3744
 #, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "索引 %d 沒有使用者 ID\n"
+
+#: g10/keyedit.c:3861
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "�ϥΪ� ID�G \""
+msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
-#, fuzzy, c-format
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   �� %08lX ñ�p�� %s%s%s\n"
+msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
 msgid " (non-exportable)"
-msgstr " (���i�ץX)"
+msgstr " (不可匯出)"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
 #, c-format
 msgid "This signature expired on %s.\n"
-msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "�p�T�w�p���M�Q�n�M�P���ܡH (y/N) "
+msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
+msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:3829
-#, fuzzy, c-format
+#: g10/keyedit.c:3905
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
+msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:3855
-#, fuzzy
+#: g10/keyedit.c:3931
 msgid " (non-revocable)"
-msgstr " (���i�ץX)"
+msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:3862
-#, fuzzy, c-format
+#: g10/keyedit.c:3938
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   �� %08lX �M�P�� %s\n"
+msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
 msgid "You are about to revoke these signatures:\n"
-msgstr "�p���b�M�P�o���G\n"
+msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
+msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
 msgid "no secret key\n"
-msgstr "�S���p�_\n"
+msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "ĵ�i�G���@���ϥΪ� ID ñ��������аO�� %d ���᪺����\n"
+msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
+
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4223
 #, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
+
+#: g10/keyedit.c:4318
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr "���b��� %s �ؤo�� %ld �����_ 0x%08lX (uid %d) ���Ӥ� ID\n"
+msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
 #: g10/keygen.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "���n�]�w %c%lu ���ƤF\n"
+msgstr "偏好設定 `%s' 重複了\n"
 
 #: g10/keygen.c:300
-#, fuzzy
 msgid "too many cipher preferences\n"
-msgstr "���n�]�w `%c' �Ӧh\n"
+msgstr "編密偏好過多\n"
 
 #: g10/keygen.c:302
-#, fuzzy
 msgid "too many digest preferences\n"
-msgstr "���n�]�w `%c' �Ӧh\n"
+msgstr "摘要偏好過多\n"
 
 #: g10/keygen.c:304
-#, fuzzy
 msgid "too many compression preferences\n"
-msgstr "���n�]�w `%c' �Ӧh\n"
+msgstr "壓縮偏好過多\n"
 
 #: g10/keygen.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "���n�]�w�r��̦��L�Ī��r��\n"
+msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:829
 msgid "writing direct signature\n"
-msgstr "���b�g�J����ñ��\n"
+msgstr "正在寫入直接簽章\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:868
 msgid "writing self signature\n"
-msgstr "���b�g�J�ۧ�ñ��\n"
+msgstr "正在寫入自我簽章\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:914
 msgid "writing key binding signature\n"
-msgstr "���b�g�J���_ñ��\n"
+msgstr "正在寫入附鑰簽章\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "���_�ؤo�L�ġF��� %u �줸\n"
+msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
 #, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "���_�ؤo�W�j�� %u �줸\n"
+msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1247
-#, fuzzy
+#: g10/keygen.c:1249
 msgid "Sign"
-msgstr "sign"
+msgstr "簽署"
 
-#: g10/keygen.c:1250
-#, fuzzy
+#: g10/keygen.c:1252
 msgid "Encrypt"
-msgstr "�[�K���"
+msgstr "加密"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
 msgid "Authenticate"
-msgstr ""
+msgstr "鑑定"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1288
-#, fuzzy, c-format
+#: g10/keygen.c:1290
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (�ȯ�[�K��)\n"
+msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
 msgid "Please select what kind of key you want:\n"
-msgstr "�п�ܩp�n�ϥΪ����_�����G\n"
+msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1350
-#, fuzzy, c-format
+#: g10/keygen.c:1352
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA �M ElGamal (�w�])\n"
+msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (�ȯ�ñ�p��)\n"
+msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1353
-#, fuzzy, c-format
+#: g10/keygen.c:1355
+#, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (�ȯ�[�K��)\n"
+msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1355
-#, fuzzy, c-format
+#: g10/keygen.c:1357
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (�ȯ�[�K��)\n"
+msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) RSA (�ȯ�ñ�p��)\n"
+msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) RSA (�ȯ�[�K��)\n"
+msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1360
-#, fuzzy, c-format
+#: g10/keygen.c:1362
+#, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (�ȯ�[�K��)\n"
+msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1429 g10/keygen.c:2502
-#, fuzzy, c-format
+#: g10/keygen.c:1431 g10/keygen.c:2508
+#, c-format
 msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA ���_��|�� 1024 �줸�C\n"
+msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
-msgstr ""
+msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1446
-#, fuzzy, c-format
+#: g10/keygen.c:1448
+#, c-format
 msgid "What keysize do you want? (%u) "
-msgstr "�p�Q�n�Φh�j�����_�ؤo�H (1024) "
+msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr ""
+msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "�p�ҭn�D�����_�ؤo�O %u �줸\n"
+msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
 #, c-format
 msgid "rounded up to %u bits\n"
-msgstr "�[�j�� %u �줸\n"
+msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3488,14 +3479,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"�Ы��w�o����_�����Ĵ����O�h�[�C\n"
-"         0 = ���_���|�L��\n"
-"      <n>  = ���_�b n �ѫ�|�L��\n"
-"      <n>w = ���_�b n �g��|�L��\n"
-"      <n>m = ���_�b n ���|�L��\n"
-"      <n>y = ���_�b n �~��|�L��\n"
-
-#: g10/keygen.c:1537
+"請指定這把金鑰的有效期限是多久.\n"
+"         0 = 金鑰不會過期\n"
+"      <n>  = 金鑰在 n 天後會過期\n"
+"      <n>w = 金鑰在 n 週後會過期\n"
+"      <n>m = 金鑰在 n 月後會過期\n"
+"      <n>y = 金鑰在 n 年後會過期\n"
+
+#: g10/keygen.c:1539
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3504,50 +3495,58 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"�Ы��w�o��ñ�������Ĵ����O�h�[�C\n"
-"         0 = ���|�L��\n"
-"      <n>  = ñ���b n �ѫ�|�L��\n"
-"      <n>w = �b n �g��|�L��\n"
-"      <n>m = �b n ���|�L��\n"
-"      <n>y = �b n �~��|�L��\n"
-
-#: g10/keygen.c:1559
-msgid "Key is valid for? (0) "
-msgstr "���_�����Ĵ����O�h�[�H (0) "
+"請指定這份簽章的有效期限是多久.\n"
+"         0 = 簽章不會過期\n"
+"      <n>  = 簽章在 n 天後會過期\n"
+"      <n>w = 簽章在 n 週後會過期\n"
+"      <n>m = 簽章在 n 月後會過期\n"
+"      <n>y = 簽章在 n 年後會過期\n"
 
 #: g10/keygen.c:1561
+msgid "Key is valid for? (0) "
+msgstr "金鑰的有效期限是多久? (0) "
+
+#: g10/keygen.c:1563
 msgid "Signature is valid for? (0) "
-msgstr "ñ�������Ĵ����O�h�[�H (0) "
+msgstr "簽章的有效期限是多久? (0) "
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
 msgid "invalid value\n"
-msgstr "�L�Ī��ƭ�\n"
+msgstr "無效的數值\n"
 
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
-msgstr "%s �������|�L��\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
+msgstr "%s 完全不會過期\n"
 
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
-msgstr "%s �N�|�b %s �L��\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s 完全不會過期\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
+msgstr "%s 將會在 %s 過期\n"
 
 #: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "這份簽署在 %s 過期.\n"
+
+#: g10/keygen.c:1590
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"�p���t�εL�k��� 2038 �~�H�᪺����C\n"
-"���L�A���i�H���T�B�z���� 2106 �~���e���~���C\n"
+"妳的系統無法顯示 2038 年以後的日期.\n"
+"不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1589
-#, fuzzy
+#: g10/keygen.c:1595
 msgid "Is this correct? (y/N) "
-msgstr "�H�W���T�ܡH (y/n) "
+msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1632
-#, fuzzy
+#: g10/keygen.c:1638
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3557,920 +3556,907 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"�p�ݭn�@�ӨϥΪ� ID �ӿ��ѩp�����_�F�o�ӳn��|�ίu��m�W�B\n"
-"�����M�q�l�l��a�}�զX���ϥΪ� ID �p�U�G\n"
-"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"妳需要一個使用者 ID 來辨識妳的金鑰; 這個軟體會用真實姓名,\n"
+"註釋和電子郵件地址組合成使用者 ID 如下:\n"
+"    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Real name: "
-msgstr "�u��m�W�G "
+msgstr "真實姓名: "
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
 msgid "Invalid character in name\n"
-msgstr "�m�W�t���L�Ī��r��\n"
+msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
 msgid "Name may not start with a digit\n"
-msgstr "�m�W���i�H�μƦr�}�Y\n"
+msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
 msgid "Name must be at least 5 characters long\n"
-msgstr "�m�W�ܤ֭n�����Ӧr�Ū�\n"
+msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
 msgid "Email address: "
-msgstr "�q�l�l��a�}�G "
+msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Not a valid email address\n"
-msgstr "���O���Ī��q�l�l��a�}\n"
+msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
 msgid "Comment: "
-msgstr "�����G "
+msgstr "註釋: "
 
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
 msgid "Invalid character in comment\n"
-msgstr "�����t���L�Ī��r��\n"
+msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "�p���b�ϥ� `%s' �r�����C\n"
+msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"�p��ܤF�o�ӨϥΪ� ID �G\n"
+"妳選擇了這個使用者 ID:\n"
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "�Ф��n��q�l�l��a�}��i�p���u��m�W�ε�����\n"
+msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�ΰh�X(Q)�H "
+msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�νT�w(O)/�h�X(Q)�H "
+msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
 msgid "Please correct the error first\n"
-msgstr "���q�����~\n"
+msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"�p�ݭn�@�ӱK�X��ӫO�@�p���p�_�C\n"
+"妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
 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"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"�p���Q�n���K�X�� �w �o�ӷQ�k��b�O **�D�z�F** �I\n"
-"�ڤ��M�|�өp�Q���h���C�p����ɭԳ��i�H�ܧ�p���K�X��A\n"
-"�Ȼݭn�A������o�ӵ{���A�åB�ϥ� \"--edit-key\" �ﶵ�Y�i�C\n"
+"妳不想要有密語 - 這個想法實在是 **遭透了**!\n"
+"我仍然會照妳想的去做. 妳任何時候都可以變更妳的密語,\n"
+"僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
 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"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"�ڭ̻ݭn���ͤj�q���H���줸�աC�o�Ӯɭԩp�i�H�h���@�ǨƱ�\n"
-"�]���O�V����L�B���ʷƹ��BŪ�g�w�Ф������^\n"
-"�o�|���H���Ʀr���;�����h�����|��o���h���üơC\n"
+"我們需要產生大量的隨機位元組. 這個時候妳可以多做一些事情\n"
+"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
+"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
 msgid "Key generation canceled.\n"
-msgstr "�w�������_���͡C\n"
+msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "���b�N���_�g�� `%s'\n"
+msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2761 g10/keygen.c:2899
-#, fuzzy, c-format
+#: g10/keygen.c:2767 g10/keygen.c:2912
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "���b�N�p�_�g�� `%s'\n"
+msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
 #, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "���b�N�p�_�g�� `%s'\n"
+msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
 #, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "�䤣��i�g�����_�_�Ͱ�G %s\n"
+msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "�䤣��i�g���p�_�_�Ͱ�G %s\n"
+msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "�g�J���_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
 msgid "public and secret key created and signed.\n"
-msgstr "���_�M�p�_�w�g�Q�إߤ�ñ�p�F�C\n"
+msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
-"�Ъ`�N�o����_����Ψӥ[�K���ΡC�p������ \"--edit-key\" ���O\n"
-"�Ӳ��ͦ��_�צ�C\n"
+"請注意這把金鑰不能用來加密之用. 妳必須用 \"--edit-key\" 指令\n"
+"來產生次鑰纔行.\n"
 
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "�Ъ`�N�G�� v3 ���_�s�y�l�_�|���h OpenPGP �ۮe��\n"
+msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3052 g10/keygen.c:3174
-#, fuzzy
+#: g10/keygen.c:3077 g10/keygen.c:3201
 msgid "Really create? (y/N) "
-msgstr "�u���n�إ߶ܡH "
+msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3327
-#, fuzzy, c-format
+#: g10/keygen.c:3354
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
+msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3374
-#, fuzzy, c-format
+#: g10/keygen.c:3401
+#, c-format
 msgid "can't create backup file `%s': %s\n"
-msgstr "�L�k�إ� `%s' �G %s\n"
+msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3397
-#, fuzzy, c-format
+#: g10/keygen.c:3424
+#, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "�Ъ`�N�G�p�_ %08lX �b %s �L���F\n"
+msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
 #, c-format
 msgid "length of RSA modulus is not %d\n"
-msgstr ""
+msgstr "RSA 系數的長度並非 %d\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
 msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgstr "公用指數太大 (超過 32 位元)\n"
 
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
 #, c-format
 msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgstr "RSA 質數的長度並非 %d\n"
 
 #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
 msgid "never     "
-msgstr "�û����L��"
+msgstr "永遠不過期"
 
-#: g10/keylist.c:201
+#: g10/keylist.c:264
 msgid "Critical signature policy: "
-msgstr "������h�G "
+msgstr "關鍵簽章原則: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:266
 msgid "Signature policy: "
-msgstr "��h�G "
+msgstr "簽章原則: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:305
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "執意偏好的金鑰伺服器: "
 
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
 msgid "WARNING: invalid notation data found\n"
-msgstr "ĵ�i�G���L�Ī��аO���\n"
+msgstr "警告: 找到無效的標記資料\n"
 
-#: g10/keylist.c:309
+#: g10/keylist.c:372
 msgid "Critical signature notation: "
-msgstr "����ñ���аO�G "
+msgstr "關鍵簽章標記： "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:374
 msgid "Signature notation: "
-msgstr "ñ���аO�G "
+msgstr "簽章標記： "
 
-#: g10/keylist.c:322
+#: g10/keylist.c:385
 msgid "not human readable"
-msgstr "���O�H����Ū�o����"
+msgstr "不是人類能讀得懂的"
 
-#: g10/keylist.c:423
+#: g10/keylist.c:486
 msgid "Keyring"
-msgstr "�_�Ͱ�"
+msgstr "鑰匙圈"
 
-#: g10/keylist.c:729
-#, fuzzy, c-format
+#: g10/keylist.c:792
+#, c-format
 msgid "expired: %s)"
-msgstr " [���Ĵ����G %s]"
+msgstr "已過期: %s)"
 
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
 msgid "Primary key fingerprint:"
-msgstr "�D�_�����G"
+msgstr "主鑰指紋:"
 
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
 msgid "     Subkey fingerprint:"
-msgstr "              �l�_�����G"
+msgstr "              子鑰指紋:"
 
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
 msgid " Primary key fingerprint:"
-msgstr " �D�_�����G"
+msgstr " 主鑰指紋:"
 
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
 msgid "      Subkey fingerprint:"
-msgstr "               �l�_�����G"
+msgstr "               子鑰指紋:"
 
-#: g10/keylist.c:1440 g10/keylist.c:1444
-#, fuzzy
+#: g10/keylist.c:1503 g10/keylist.c:1507
 msgid "      Key fingerprint ="
-msgstr "            ���_���� ="
+msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "      卡片序號 ="
 
 #: g10/keyring.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "�i��ʸ˥��ѡG %s\n"
+msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
 #: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "ĵ�i�G2 ���ɮצs�b�����ۥ٬ު���T�C\n"
+msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n"
 
 #: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
-msgstr "%s �O�S�����ܪ����@��\n"
+msgstr "%s 是沒有改變的那一個\n"
 
 #: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
-msgstr "%s �O�s�����@��\n"
+msgstr "%s 是新的那一個\n"
 
 #: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
-msgstr "�Э׸ɳo�ӥi�઺�w���ʵ��_\n"
+msgstr "請修補這個可能的安全性裂縫\n"
 
 #: g10/keyring.c:1375
-#, fuzzy, c-format
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "���b�ˬd�_�Ͱ� `%s'\n"
+msgstr "正在快取鑰匙圈 `%s'\n"
 
 #: g10/keyring.c:1421
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
+msgstr "目前檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
 #: g10/keyring.c:1433
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
+msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
 #: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: �_�Ͱ�w�إ�\n"
+msgstr "%s: 鑰匙圈已建立\n"
 
 #: g10/keyserver.c:98
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr "ĵ�i�G�b `%s' �̪��ﶵ��o����������èS���Q�ҥ�\n"
+msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:378
-#, fuzzy
+#: g10/keyserver.c:425
 msgid "disabled"
-msgstr "disable"
+msgstr "已禁用"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:662 g10/keyserver.c:1147
-#, fuzzy, c-format
+#: g10/keyserver.c:709 g10/keyserver.c:1229
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "�L�Ī��ץX�ﶵ\n"
+msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
 
-#: g10/keyserver.c:752
-#, fuzzy, c-format
+#: g10/keyserver.c:799
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "�䤣�� `%s' ���_�G %s\n"
+msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:754
-#, fuzzy
+#: g10/keyserver.c:801
 msgid "key not found on keyserver\n"
-msgstr "�䤣�� `%s' ���_�G %s\n"
+msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:901
-#, fuzzy, c-format
+#: g10/keyserver.c:976
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "���_ %08lX ���V %s �n�D��\n"
+msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:905
-#, fuzzy, c-format
+#: g10/keyserver.c:980
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "���_ %08lX ���V %s �n�D��\n"
+msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1050
-#, fuzzy, c-format
+#: g10/keyserver.c:1132
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "���b�j�M \"%s\" �� HKP ���A�� %s �W\n"
+msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1054
-#, fuzzy, c-format
+#: g10/keyserver.c:1136
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"�w�g�Q�p�����_ %08lX ñ�p�� %s\n"
+msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1097
-#, fuzzy, c-format
+#: g10/keyserver.c:1179
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "���b�j�M \"%s\" �� HKP ���A�� %s �W\n"
+msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1100
-#, fuzzy, c-format
+#: g10/keyserver.c:1182
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "���b�j�M \"%s\" �� HKP ���A�� %s �W\n"
+msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
-#, fuzzy
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
 msgid "no keyserver action!\n"
-msgstr "�L�Ī��ץX�ﶵ\n"
+msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
+msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
 msgid "external keyserver calls are not supported in this build\n"
-msgstr ""
+msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr ""
+msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+msgstr "gpgkeys_%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1261
-#, fuzzy
+#: g10/keyserver.c:1342
 msgid "keyserver timed out\n"
-msgstr "���_���A�����~"
+msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1266
-#, fuzzy
+#: g10/keyserver.c:1347
 msgid "keyserver internal error\n"
-msgstr "���_���A�����~"
+msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1275
-#, fuzzy, c-format
+#: g10/keyserver.c:1356
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "���ͪ��_���ѡG %s\n"
+msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1585
-#, fuzzy, c-format
+#: g10/keyserver.c:1666
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "ĵ�i�G�L�k�����Ȧs�� (%s) `%s': %s\n"
+msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1607
-#, fuzzy, c-format
+#: g10/keyserver.c:1688
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "���_ %08lX ���V %s �n�D��\n"
+msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1609
-#, fuzzy, c-format
+#: g10/keyserver.c:1690
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "���_ %08lX ���V %s �n�D��\n"
+msgstr "正在更新 %d 份金鑰自 %s\n"
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr "�[�K�L�����q���_ (%d) �ؤo�޲�\n"
+msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
 #: g10/mainproc.c:262
-#, fuzzy, c-format
+#, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "�������s�K�t��k"
+msgstr "錯誤的密語或未知的編密演算法 (%d)\n"
 
 #: g10/mainproc.c:299
-#, fuzzy, c-format
+#, c-format
 msgid "%s encrypted session key\n"
-msgstr "�[�K�L�����q���_ (%d) �ؤo�޲�\n"
+msgstr "%s 加密過的階段金鑰\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "�H�������t��k %d �[�K�L\n"
+msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
 #: g10/mainproc.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "public key is %s\n"
-msgstr "���_�O %08lX\n"
+msgstr "公鑰為 %s\n"
 
 #: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "���_�[�K�L����ơG���n�� DEK\n"
+msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
 #: g10/mainproc.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "�H %u �줸 %s ID %08lX �إߩ� %s �����_�[�K�L\n"
+msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
 #: g10/mainproc.c:465 g10/pkclist.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                ��Y \""
+msgstr "      \"%s\"\n"
 
 #: g10/mainproc.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "�H %s ID %08lX �����_�[�K�L\n"
+msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
 #: g10/mainproc.c:483
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "���_�ѱK���ѡG %s\n"
+msgstr "公鑰解密失敗: %s\n"
 
 #: g10/mainproc.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "�ЦA��J�@���K�X��\n"
+msgstr "已用 %lu 個密語加密了\n"
 
 #: g10/mainproc.c:499
-#, fuzzy
 msgid "encrypted with 1 passphrase\n"
-msgstr "�ЦA��J�@���K�X��\n"
+msgstr "已用 1 個密語加密了\n"
 
 #: g10/mainproc.c:527 g10/mainproc.c:549
 #, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "���w %s ���[�K�L�����\n"
+msgstr "假定 %s 為加密過的資料\n"
 
 #: g10/mainproc.c:535
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA �s�K�k���i�ΡA�ڭ̼��[�a�յۧ�H %s �N��\n"
+msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
 #: g10/mainproc.c:567
 msgid "decryption okay\n"
-msgstr "�ѱK���\\n"
+msgstr "解密成功\n"
 
 #: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
-msgstr "ĵ�i�G�T�������짹�㪺�O�@\n"
+msgstr "警告: 訊息未受到完整的保護\n"
 
 #: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "ĵ�i�G�[�K�L���T���w�g�Q�ܳy�F�I\n"
+msgstr "警告: 加密過的訊息已經被變造了！\n"
 
 #: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "�ѱK���ѡG %s\n"
+msgstr "解密失敗: %s\n"
 
 #: g10/mainproc.c:610
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "�Ъ`�N�G�H��̭n�D�F�u�p���Ӭ�β����ݡv\n"
+msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
 #: g10/mainproc.c:612
 #, c-format
 msgid "original file name='%.*s'\n"
-msgstr "��l���ɦW ='%.*s'\n"
+msgstr "原始的檔名 ='%.*s'\n"
 
 #: g10/mainproc.c:784
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "�W�ߺM�P �w �Х� \"gpg --import\" �ӮM��\n"
+msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
 #: g10/mainproc.c:1288
 msgid "signature verification suppressed\n"
-msgstr "ñ�����Ҥw�Q����\n"
+msgstr "簽章驗證已被抑制\n"
 
 #: g10/mainproc.c:1330 g10/mainproc.c:1340
 msgid "can't handle these multiple signatures\n"
-msgstr "�L�k�B�z�o�Ǧh��ñ��\n"
+msgstr "無法處理這些多重簽章\n"
 
 #: g10/mainproc.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s\n"
-msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+msgstr "由 %s 建立的簽章\n"
 
 #: g10/mainproc.c:1351
-#, fuzzy, c-format
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                ��Y \""
+msgstr "               使用 %s 金鑰 %s\n"
 
 #: g10/mainproc.c:1355
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "�� %.*s �إߪ�ñ���A�ϥ� %s ���_ ID %08lX\n"
+msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
 #: g10/mainproc.c:1375
-#, fuzzy
 msgid "Key available at: "
-msgstr "�S���i������"
+msgstr "可用的金鑰於: "
 
 #: g10/mainproc.c:1480 g10/mainproc.c:1528
-#, fuzzy, c-format
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "*�l�a* ��ñ���Ӧ۩� \""
+msgstr "*損壞* 的簽章來自於 \"%s\""
 
 #: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "�L����ñ���Ӧ۩� \""
+msgstr "過期的簽章來自於 \"%s\""
 
 #: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "���n��ñ���Ӧ۩� \""
+msgstr "完好的簽章來自於 \"%s\""
 
 #: g10/mainproc.c:1536
 msgid "[uncertain]"
-msgstr "[���T�w]"
+msgstr "[不確定]"
 
 #: g10/mainproc.c:1568
-#, fuzzy, c-format
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                ��Y \""
+msgstr "                亦即 \"%s\""
 
 #: g10/mainproc.c:1662
 #, c-format
 msgid "Signature expired %s\n"
-msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+msgstr "這份簽署已經在 %s 過期了.\n"
 
 #: g10/mainproc.c:1667
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "�o��ñ�p�b %s �L���C\n"
+msgstr "這份簽署在 %s 過期.\n"
 
 #: g10/mainproc.c:1670
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s �A�K�n�t��k %s\n"
+msgstr "%s 簽章, 摘要演算法 %s\n"
 
 #: g10/mainproc.c:1671
 msgid "binary"
-msgstr "�G�i��"
+msgstr "二進制"
 
 #: g10/mainproc.c:1672
 msgid "textmode"
-msgstr "��r�Ҧ�"
+msgstr "文字模式"
 
 #: g10/mainproc.c:1672 g10/trustdb.c:530
 msgid "unknown"
-msgstr "����"
+msgstr "未知"
 
 #: g10/mainproc.c:1692
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "�L�k�ˬdñ���G %s\n"
+msgstr "無法檢查簽章: %s\n"
 
 #: g10/mainproc.c:1760 g10/mainproc.c:1776 g10/mainproc.c:1862
 msgid "not a detached signature\n"
-msgstr "���O�@��������ñ��\n"
+msgstr "不是一份分離的簽章\n"
 
 #: g10/mainproc.c:1803
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "ĵ�i�G������h��ñ���C�馳�Ĥ@��ñ���׷|�Q�ֿ�C\n"
+msgstr "警告: 偵測到多重簽章.  祇有第一個簽章纔會被核選.\n"
 
 #: g10/mainproc.c:1811
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "���� 0x%02x ���W��ñ��\n"
+msgstr "等級 0x%02x 的獨立簽章\n"
 
 #: g10/mainproc.c:1868
 msgid "old style (PGP 2.x) signature\n"
-msgstr "�«� (PGP 2.x) ñ��\n"
+msgstr "舊型 (PGP 2.x) 簽章\n"
 
 #: g10/mainproc.c:1878
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "�b proc_tree() ��������L�Ī� root �ʥ]\n"
+msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
-#: g10/misc.c:105
+#: g10/misc.c:119
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "�L�k���t�ΰ���ɦL�֤��ɡG %s\n"
+msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
-#, fuzzy, c-format
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "�L�k�}���ɮסG %s\n"
+msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: g10/misc.c:190
-#, fuzzy, c-format
+#: g10/misc.c:204
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "�H����Ʈw�GŪ������ (n=%d): %s\n"
+msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: g10/misc.c:299
-#, fuzzy, c-format
+#: g10/misc.c:313
+#, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "�L�k�ާ@���}���_�t��k %d\n"
+msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
 
-#: g10/misc.c:314
-#, fuzzy, c-format
+#: g10/misc.c:328
+#, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "���Q�ĥΪ��s�K�t��k"
+msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
 
-#: g10/misc.c:329
-#, fuzzy, c-format
+#: g10/misc.c:343
+#, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "%s �A�K�n�t��k %s\n"
+msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 
-#: g10/misc.c:334
-#, fuzzy, c-format
+#: g10/misc.c:348
+#, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
+msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:444
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA �s�K�k�~���Ҳդ��s�b\n"
+msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:431
+#: g10/misc.c:445
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "�аѦ� http://www.gnupg.org/why-not-idea.html ���o��h��T\n"
+msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:678
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: ����ij�ϥΪ��ﶵ \"%s\"\n"
+msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:682
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ĵ�i�G \"%s\" �ﶵ�w����ij�ϥ�\n"
+msgstr "警告： \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:684
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "��H \"%s%s\" �N��\n"
+msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:681
-#, fuzzy
+#: g10/misc.c:695
 msgid "Uncompressed"
-msgstr "���Q�B�z"
+msgstr "未被壓縮"
 
-#: g10/misc.c:706
-#, fuzzy
+#: g10/misc.c:720
 msgid "uncompressed|none"
-msgstr "���Q�B�z"
+msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:816
+#: g10/misc.c:830
 #, c-format
 msgid "this message may not be usable by %s\n"
-msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
+msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:973
-#, fuzzy, c-format
+#: g10/misc.c:987
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "�q `%s' Ū���ﶵ\n"
+msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:998
-#, fuzzy, c-format
+#: g10/misc.c:1012
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "�������w�]����� `%s'\n"
+msgstr "未知的選項 `%s'\n"
 
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "�ɮ� `%s' �s�b�C "
+msgstr "檔案 `%s' 存在. "
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "�O�_�мg (y/N)�H "
+msgstr "是否覆寫? (y/N) "
 
 #: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s: ���������ɦW\n"
+msgstr "%s: 未知的副檔名\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
-msgstr "�п�J�s���ɦW"
+msgstr "請輸入新的檔名"
 
 #: g10/openfile.c:184
 msgid "writing to stdout\n"
-msgstr "���b�g�J��зǿ�X\n"
+msgstr "正在寫入到標準輸出\n"
 
 #: g10/openfile.c:296
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "���]�Qñ�p����Ʀb `%s'\n"
+msgstr "假設被簽署的資料在 `%s'\n"
 
 #: g10/openfile.c:375
 #, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "�s���]�w�� `%s' �Q�إߤF\n"
+msgstr "新的設定檔 `%s' 被建立了\n"
 
 #: g10/openfile.c:377
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr "ĵ�i�G�b `%s' �̪��ﶵ��o����������èS���Q�ҥ�\n"
+msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 
 #: g10/openfile.c:409
-#, fuzzy, c-format
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: �ؿ��إߧ���\n"
+msgstr "目錄 `%s' 已建立\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "�L�k�ާ@���}���_�t��k %d\n"
+msgstr "無法操作公開金鑰演算法 %d\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr ""
+msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
+msgstr "%d 類別的子封包設定了關鍵位元\n"
 
 #: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent �b�����q�L�k�ϥ�\n"
+msgstr "gpg-agent 在此階段無法使用\n"
 
 #: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
-msgstr "�L�k�]�w�N�z�{�������ϥΪ̺� pid\n"
+msgstr "無法設定代理程式中的使用者端 pid\n"
 
 #: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
-msgstr "�L�k���o�N�z�{���һݪ����A��Ū���ɮ״y�z\n"
+msgstr "無法取得代理程式所需的伺服器讀取檔案描述\n"
 
 #: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
-msgstr "�L�k���o�N�z�{���һݪ����A���g�J�ɮ״y�z\n"
+msgstr "無法取得代理程式所需的伺服器寫入檔案描述\n"
 
 #: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "�Q�ܳy�� GPG_AGENT_INFO �����ܼ�\n"
+msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
 #: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent ��w���� %d ���Q�䴩\n"
+msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
 #: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "�L�k�s���� `%s' �G %s\n"
+msgstr "無法連接至 `%s': %s\n"
 
 #: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
-msgstr "gpg-agent ���q�T���D\n"
+msgstr "gpg-agent 的通訊問題\n"
 
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
 msgid "problem with the agent - disabling agent use\n"
-msgstr "�N�z�{�������D �w ���b���ΥN�z�{��\n"
+msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:700 g10/passphrase.c:1205
-#, fuzzy, c-format
+#: g10/passphrase.c:699 g10/passphrase.c:1205
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (�D�n���_ ID %08lX)"
+msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:714
-#, fuzzy, c-format
+#: g10/passphrase.c:713
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
-"�p�ݭn�U�C�ϥΪ̪��K�X��ӸѶ}�p�_�G\n"
+"妳需要用密語來解開下列使用者的私鑰：\n"
 "\"%.*s\"\n"
-"%u �줸 %s ID %08lX �����_�A�إߩ� %s%s\n"
+"%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
 msgid "Repeat passphrase\n"
-msgstr "�ЦA��J�@���K�X��\n"
+msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
 msgid "Enter passphrase\n"
-msgstr "�п�J�K�X��\n"
+msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
-msgstr "�K�X��Ӫ�\n"
+msgstr "密語太長\n"
 
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
-msgstr "�N�z�{���Ǧ^�L�Ī��^��\n"
+msgstr "代理程式傳回無效的回應\n"
 
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
 msgid "cancelled by user\n"
-msgstr "�ѨϥΪ̨����F\n"
+msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "�N�z�{�������D�G�N�z�{���Ǧ^ 0x%lx\n"
+msgstr "代理程式的問題: 代理程式傳回 0x%lx\n"
 
 #: g10/passphrase.c:1096 g10/passphrase.c:1258
-#, fuzzy
 msgid "can't query passphrase in batch mode\n"
-msgstr "�b�妸�Ҧ����L�k�߰ݱK�X\n"
+msgstr "無法在批次模式中查詢密語\n"
 
 #: g10/passphrase.c:1103 g10/passphrase.c:1263
 msgid "Enter passphrase: "
-msgstr "�п�J�K�X��G "
+msgstr "請輸入密語: "
 
 #: g10/passphrase.c:1186
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
-"�p�ݭn�U�C�ϥΪ̪��K�X��A�ׯ�Ѷ}�p�_�G\n"
-"\""
+"妳需要用密語來解開下列使用者的\n"
+"私鑰: \"%s\"\n"
 
 #: g10/passphrase.c:1192
-#, fuzzy, c-format
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "%u �줸 %s ID %08lX �����_�A�إߩ� %s"
+msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
 #: g10/passphrase.c:1201
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "         (在主鑰 ID %s 上的子鑰)"
 
 #: g10/passphrase.c:1267
 msgid "Repeat passphrase: "
-msgstr "�ЦA��J�@���K�X��G "
+msgstr "請再輸入一次密語: "
 
 #: g10/photoid.c:66
 msgid ""
@@ -4481,122 +4467,114 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 "\n"
-"�ЬD��@�i�Ϥ��ӷ����p���Ӥ� ID �C�o�i�Ϥ��@�w�n�O JPEG �����צ�C\n"
-"�аO���o�i�Ϥ��|�Q�s��b�p�����_�̡C�p�G�p�D�F�D�`�j���Ϥ����ܡA\n"
-"�p�����_�]�|�ܦ��D�`�a�j�I\n"
-"�ɶq��Ϥ��ؤo����b 240x288 ���k�A�|�O�ӫD�`�z�Q���j�p�C\n"
+"請挑選一張圖片來當成妳的照片 ID. 這張圖片一定要是 JPEG 圖檔纔行.\n"
+"請記住這張圖片會被存放在妳的公鑰裡. 如果妳挑了非常大的圖片的話,\n"
+"妳的金鑰也會變成非常地大!\n"
+"盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
 
 #: g10/photoid.c:80
 msgid "Enter JPEG filename for photo ID: "
-msgstr "��J�n���@�ۤ� ID �� JPEG �ɦW�G "
+msgstr "輸入要當作相片 ID 的 JPEG 檔名: "
 
 #: g10/photoid.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "�L�k�}���ɮסG %s\n"
+msgstr "無法開啟 JPEG 圖檔 `%s': %s\n"
 
 #: g10/photoid.c:102
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 
 #: g10/photoid.c:104
-#, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "�p�T�w�n�Υ��ܡH (y/N) "
+msgstr "妳確定要用它嗎? (y/N) "
 
 #: g10/photoid.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "\"%s\" ���O�@�� JPEG ����\n"
+msgstr "`%s' 不是一個 JPEG 圖檔\n"
 
 #: g10/photoid.c:136
 msgid "Is this photo correct (y/N/q)? "
-msgstr "�o�i�Ӥ����T�ܡH (y/N/q) "
+msgstr "這張照片正確嗎? (y/N/q) "
 
 #: g10/photoid.c:338
 msgid "unable to display photo ID!\n"
-msgstr "�L�k��ܷӤ� ID �I\n"
+msgstr "無法顯示照片 ID!\n"
 
 #: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
-msgstr "�����w��]"
+msgstr "未指定原因"
 
 #: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
-msgstr "���_�Q�N���F"
+msgstr "金鑰被代換了"
 
 #: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
-msgstr "���_�w�g�Q���|�F"
+msgstr "金鑰已經被洩漏了"
 
 #: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
-msgstr "���_���A�Q�ϥΤF"
+msgstr "金鑰不再被使用了"
 
 #: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
-msgstr "�ϥΪ� ID ���A���ĤF"
+msgstr "使用者 ID 不再有效了"
 
 #: g10/pkclist.c:73
 msgid "reason for revocation: "
-msgstr "�M�P��]�G "
+msgstr "撤銷原因: "
 
 #: g10/pkclist.c:90
 msgid "revocation comment: "
-msgstr "�M�P�����G "
+msgstr "撤銷註釋: "
 
 #: g10/pkclist.c:205
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
 #: g10/pkclist.c:213
-#, fuzzy
 msgid "No trust value assigned to:\n"
-msgstr ""
-"�U�C���بS���������H���ȡG\n"
-"%4u%c/%08lX %s \""
+msgstr "下列項目沒有對應的信任值:\n"
 
 #: g10/pkclist.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                ��Y \""
+msgstr "  亦即 \"%s\"\n"
 
 #: g10/pkclist.c:255
-#, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "�o����_���i���ݩ�o�ӫ�����\n"
+msgstr "妳有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
 #: g10/pkclist.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = �����D\n"
+msgstr " %d = 我不知道或不想說\n"
 
 #: g10/pkclist.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = �� *��* �H��\n"
+msgstr "  %d = 我*不*信任\n"
 
 #: g10/pkclist.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = �ڹ����H��\n"
+msgstr "  %d = 我徹底信任\n"
 
 #: g10/pkclist.c:284
-#, fuzzy
 msgid "  m = back to the main menu\n"
-msgstr " m = �^��D���\n"
+msgstr " m = 回到主選單\n"
 
 #: g10/pkclist.c:287
-#, fuzzy
 msgid "  s = skip this key\n"
-msgstr " s = ���L�o����_���B�z\n"
+msgstr " s = 跳過這把金鑰\n"
 
 #: g10/pkclist.c:288
-#, fuzzy
 msgid "  q = quit\n"
-msgstr " q = �h�X\n"
+msgstr "  q = 離開\n"
 
 #: g10/pkclist.c:292
 #, c-format
@@ -4604,133 +4582,128 @@ msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"這把金鑰的最小信任等級為: %s\n"
+"\n"
 
 #: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
-msgstr "�p���M�w�O�ƻ�H "
+msgstr "妳的決定是甚麼? "
 
 #: g10/pkclist.c:319
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "�p�u���n��o����_�]�������H���H"
+msgstr "請問妳是否真的想把這把金鑰設成徹底信任呢? (y/N) "
 
 #: g10/pkclist.c:333
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "�Q�����H�����_�����ҡG\n"
+msgstr "被徹底信任金鑰的憑證:\n"
 
 #: g10/pkclist.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
-msgstr "%08lX: �S���Ҿګ��X�o����_�u���ݩ�o�ӫ�����\n"
+msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 
 #: g10/pkclist.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
-msgstr "%08lX: �S���Ҿګ��X�o����_�u���ݩ�o�ӫ�����\n"
+msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 
 #: g10/pkclist.c:429
-#, fuzzy
 msgid "This key probably belongs to the named user\n"
-msgstr "�o����_���i���ݩ�o�ӫ�����\n"
+msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 
 #: g10/pkclist.c:434
 msgid "This key belongs to us\n"
-msgstr "�o����_�O�ݩ�ڭ̦ۤv��\n"
+msgstr "這把金鑰是屬於我們自己的\n"
 
 #: g10/pkclist.c:460
-#, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
-"�o����_�� *��* �T�w�ݩ�ϥΪ� ID �̪����ӤH�C\n"
-"���D�p **�u��** ���D�ۤv�b���ƻ�A\n"
-"�_�h�p�̦n�b�U�@�Ӱ��D�^�� no\n"
+"這把金鑰並 *不* 確定屬於使用者 ID 裡的那個人.\n"
+"除非妳 **真的** 知道自己在做甚麼,\n"
+"否則妳最好在下一個問題回答 no\n"
 
 #: g10/pkclist.c:467
-#, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "�L�צp���٬O�ϥγo����_�ܡH "
+msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
 #: g10/pkclist.c:501
 msgid "WARNING: Using untrusted key!\n"
-msgstr "ĵ�i�G���b�ϥΤ��Q�H�������_�I\n"
+msgstr "警告: 正在使用不被信任的金鑰!\n"
 
 #: g10/pkclist.c:508
-#, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G�M�P���_ %08lX ���X�{�C\n"
+msgstr "警告: 這把金鑰可能已被撤銷了 (撤銷金鑰未出現)\n"
 
 #: g10/pkclist.c:517
-#, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
+msgstr "警告: 這把金鑰已經被它的指定撤銷者給撤銷了!\n"
 
 #: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
+msgstr "警告: 這把金鑰已經被它的持有人撤銷了! \n"
 
 #: g10/pkclist.c:521
-#, fuzzy
 msgid "         This could mean that the signature is forged.\n"
-msgstr "         �o�ܦ��i����ܳo��ñ���O�Q���y���C\n"
+msgstr "         這很有可能表示這個簽章是被偽造的.\n"
 
 #: g10/pkclist.c:527
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "ĵ�i�G�o��l�_�w�g�Q���������H�M�P�F�I\n"
+msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
 
 #: g10/pkclist.c:532
 msgid "Note: This key has been disabled.\n"
-msgstr "�Ъ`�N�G�o����_�w�g�Q�T�ΤF�C\n"
+msgstr "請注意: 這把金鑰已經被禁用了.\n"
 
 #: g10/pkclist.c:537
 msgid "Note: This key has expired!\n"
-msgstr "�Ъ`�N�G�o����_�w�g�L���F�I\n"
+msgstr "請注意: 這把金鑰已經過期了!\n"
 
 #: g10/pkclist.c:548
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "ĵ�i�G�o����_�ëD�H���H����ñ���һ{�ҡI\n"
+msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
 #: g10/pkclist.c:550
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         �S���Ҿګ��X�o��ñ���ݩ�o�ӫ����̡C\n"
+msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
 #: g10/pkclist.c:558
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "ĵ�i�G�ڭ� *��* �H���o����_�I\n"
+msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
 #: g10/pkclist.c:559
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "         �o��ñ���ܦ��i��O *���y��* �C\n"
+msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
 #: g10/pkclist.c:567
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "ĵ�i�G�o����_�ëD�H�����H����ñ���һ{�ҡC\n"
+msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證.\n"
 
 #: g10/pkclist.c:569
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "         �o��ñ���ä��ݩ�o�ӫ�����\n"
+msgstr "         這份簽章並不屬於這個持有者\n"
 
 #: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
 #, c-format
 msgid "%s: skipped: %s\n"
-msgstr "%s: �w���L�G %s\n"
+msgstr "%s: 已跳過: %s\n"
 
 #: g10/pkclist.c:744 g10/pkclist.c:968
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: �w���L�G���_�w�g�s�b�F\n"
+msgstr "%s: 已跳過: 公鑰已經存在了\n"
 
 #: g10/pkclist.c:786
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "�p�S�����w�@�ӨϥΪ� ID�C(�p�i��o�� \"-r\")\n"
+msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "目前的收件者:\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -4738,168 +4711,166 @@ msgid ""
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 "\n"
-"��J�ϥΪ� ID�C �H�ťզC�����G "
+"輸入使用者 ID. 以空白列結束: "
 
 #: g10/pkclist.c:844
 msgid "No such user ID.\n"
-msgstr "�S���o�ӨϥΪ� ID �C\n"
+msgstr "沒有這個使用者 ID.\n"
 
 #: g10/pkclist.c:849 g10/pkclist.c:911
 msgid "skipped: public key already set as default recipient\n"
-msgstr "�w���L�G���_�w�g�Q�]���w�]�����\n"
+msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
 #: g10/pkclist.c:867
 msgid "Public key is disabled.\n"
-msgstr "���_�Q�T�ΤF�C\n"
+msgstr "公鑰被禁用了.\n"
 
 #: g10/pkclist.c:874
 msgid "skipped: public key already set\n"
-msgstr "�w���L�G���_�w�g�Q�]�L�F\n"
+msgstr "已跳過: 公鑰已經被設過了\n"
 
 #: g10/pkclist.c:903
-#, fuzzy, c-format
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "�������w�]����� `%s'\n"
+msgstr "未知的預設收件者 \"%s\"\n"
 
 #: g10/pkclist.c:948
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: �w���L�G���_�w�g�Q�T�ΤF\n"
+msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
 
 #: g10/pkclist.c:1003
 msgid "no valid addressees\n"
-msgstr "�S�����Ī��a�}\n"
+msgstr "沒有有效的地址\n"
 
 #: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "��ƥ��Q�x�s�F�Х� \"--output\" �ﶵ���x�s����\n"
+msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 
 #: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
-msgstr "�إ� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "建立 `%s' 時發生錯誤: %s\n"
 
 #: g10/plaintext.c:446
 msgid "Detached signature.\n"
-msgstr "�������C\n"
+msgstr "分離的簽章.\n"
 
 #: g10/plaintext.c:450
 msgid "Please enter name of data file: "
-msgstr "�п�J����ɪ��W�١G "
+msgstr "請輸入資料檔的名稱: "
 
 #: g10/plaintext.c:478
 msgid "reading stdin ...\n"
-msgstr "���b�q�зǿ�JŪ�� ...\n"
+msgstr "正在從標準輸入讀取 ...\n"
 
 #: g10/plaintext.c:512
 msgid "no signed data\n"
-msgstr "�S���Qñ�p�L�����\n"
+msgstr "沒有被簽署過的資料\n"
 
 #: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "�L�k�}�ҳQñ�p�L����� `%s'\n"
+msgstr "無法開啟被簽署過的資料 `%s'\n"
 
 #: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "�ΦW����̡F���b���ըϥΨp�_ %08lX ...\n"
+msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 
 #: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "�ܦn�A�ڭ̴N�O�ΦW����̡C\n"
+msgstr "很好, 我們就是匿名收件者.\n"
 
 #: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
-msgstr "���䴩�¦��� DEK �s�X\n"
+msgstr "不支援舊式的 DEK 編碼\n"
 
 #: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "�s�K�t��k %d%s �����Τw���ΤF\n"
+msgstr "編密演算法 %d%s 未知或已停用了\n"
 
 #: g10/pubkey-enc.c:266
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "�Ъ`�N�G���n�]�w���䤣��s�K�t��k %d\n"
+msgstr "警告: 收件者偏好設定中找不到編密演算法 %s\n"
 
 #: g10/pubkey-enc.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %s expired at %s\n"
-msgstr "�Ъ`�N�G�p�_ %08lX �b %s �L���F\n"
+msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 
 #: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "�Ъ`�N�G���_�w�g�Q�M�P�F"
+msgstr "請注意: 金鑰已經被撤銷了"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
 #: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
-msgstr "build_packet ���ѡG %s\n"
+msgstr "build_packet 失敗: %s\n"
 
 #: g10/revoke.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "���_ %08lX: �S���ϥΪ� ID\n"
+msgstr "金鑰 %s 沒有使用者 ID\n"
 
 #: g10/revoke.c:272
 msgid "To be revoked by:\n"
-msgstr "�N�Q�M�P�G\n"
+msgstr "將被撤銷:\n"
 
 #: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
-msgstr "�]�o�O����K���M�P���_�^\n"
+msgstr "(這是把機密的撤銷金鑰)\n"
 
 #: g10/revoke.c:280
-#, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "�n���o����_�إߤ@���M�P���ҶܡH "
+msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
 #: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
-msgstr "�w�j���ϥ� ASCII �ʸ˹L����X�C\n"
+msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
 #: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
-msgstr "make_keysig_packet ���ѡG %s\n"
+msgstr "make_keysig_packet 失敗: %s\n"
 
 #: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
-msgstr "�w�إߺM�P���ҡC\n"
+msgstr "已建立撤銷憑證.\n"
 
 #: g10/revoke.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "�S����� `%s' ���M�P���_\n"
+msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
 #: g10/revoke.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "�䤣�� `%s' �p�_�G %s\n"
+msgstr "找不到私鑰 \"%s\": %s\n"
 
 #: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
-msgstr "�S���۹��������_�G %s\n"
+msgstr "沒有相對應的公鑰: %s\n"
 
 #: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
-msgstr "���_�P�p�_��k�X�I\n"
+msgstr "公鑰與私鑰並不吻合!\n"
 
 #: g10/revoke.c:479
-#, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "�n���o����_�إߤ@���M�P���ҶܡH "
+msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
 #: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
-msgstr "�������O�@�t��k\n"
+msgstr "未知的保護演算法\n"
 
 #: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
-msgstr "�`�N�G�o����_�S���Q�O�@�I\n"
+msgstr "注意: 這把金鑰沒有被保護!\n"
 
 #: g10/revoke.c:551
 msgid ""
@@ -4911,240 +4882,240 @@ msgid ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 msgstr ""
-"�w�إߺM�P���ҡC\n"
+"已建立撤銷憑證.\n"
 "\n"
-"�Ч�o���ɮ׷h����t�@�өp����N���ð_�Ӫ��C���W�F\n"
-"�p�G���H������o�o�����Ҫ��ܡA����L�]������p��\n"
-"���_�L�k�~��ϥΡC��o�����ҦC�L�X�ӦA�è�O���a\n"
-"��]�O�ܦn����k�A�H�K�p���x�s�C���l���ӵL�kŪ���C\n"
-"���O�d�U�p�ߡG�p�������W���C�L�t�Υi��|�b�C�L�L\n"
-"�{����o�Ǹ�ƼȦs�b�Y�Ө�L�H�]����ݱo�쪺�a��I\n"
+"請把這個檔案搬移到另一個妳能夠將之藏起來的媒介上;\n"
+"如果有人能夠取得這份憑證的話, 那麼他也能夠讓妳的\n"
+"金鑰無法繼續使用. 把這份憑證列印出來再藏到別的地\n"
+"方也是很好的方法, 以免妳的儲存媒介損毀而無法讀取.\n"
+"但是千萬小心: 妳的機器上的列印系統可能會在列印過\n"
+"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
 
 #: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
-msgstr "�п�ܺM�P����]�G\n"
+msgstr "請選擇撤銷的原因:\n"
 
 #: g10/revoke.c:602
 msgid "Cancel"
-msgstr "����"
+msgstr "取消"
 
 #: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr "�]�]�\�p�|�Q�n�b�o�̿�� %d �^\n"
+msgstr "(也許妳會想要在這裡選擇 %d)\n"
 
 #: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "�п�J��Ϊ��y�z�F�H�ťզC�����G\n"
+msgstr "請輸入選用的描述; 以空白列結束:\n"
 
 #: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "�M�P��]�G %s\n"
+msgstr "撤銷原因: %s\n"
 
 #: g10/revoke.c:675
 msgid "(No description given)\n"
-msgstr "�]�S�����w�y�z�^\n"
+msgstr "(沒有給定描述)\n"
 
 #: g10/revoke.c:680
-#, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "�o�˥i�H�ܡH "
+msgstr "這樣可以嗎? (y/N) "
 
 #: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
-msgstr "�p�_�����L�k����\n"
+msgstr "私鑰部分無法取用\n"
 
 #: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "�O�@�t��k %d%s ���Q�䴩\n"
+msgstr "保護演算法 %d%s 未被支援\n"
 
 #: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "�O�@�t��k %d%s ���Q�䴩\n"
+msgstr "保護摘要 %d 未被支援\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
 msgid "Invalid passphrase; please try again"
-msgstr "�L�Ī��K�X��F�ЦA�դ@��"
+msgstr "無效的密語; 請再試一次"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "ĵ�i�G��������_���z �w �ЦA�󴫱K�X��@���C\n"
+msgstr "警告: 偵測到金鑰薄弱 - 請再更換密語一次.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "���b���ͨp�_�O�@�|�Ψ쪺�¦� 16 �줸�[�`�ˬd\n"
+msgstr "正在產生私鑰保護會用到的舊式 16 位元加總檢查\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
-msgstr "�إߤF�z���_ �w ���b����\n"
+msgstr "建立了弱金鑰 ─ 正在重試\n"
 
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "�L�k�קK��٦��s�K�k���z���_�F�w�g�դF %d ���F�I\n"
+msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
 #: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA �n�D�ϥ� 160 �줸������t��k\n"
+msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
 
 #: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "ĵ�i�Gñ���K�n�P�T�����@�P\n"
+msgstr "警告: 簽章摘要與訊息不一致\n"
 
 #: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr ""
+msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
 #: g10/sig-check.c:102
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
+msgstr "警告: 正要簽署的子鑰 %s 有無效的交叉憑證\n"
 
 #: g10/sig-check.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr "���_ %08lX ��ñ���٭n�s�F %lu ��\n"
+msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
 #: g10/sig-check.c:169
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr "���_ %08lX ��ñ���٭n�s�F %lu ��\n"
+msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
 #: g10/sig-check.c:180
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
-msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+msgstr ""
+"金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:182
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
-msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+msgstr ""
+"金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "�Ъ`�N�Gñ�����_ %08lX �w�� %s �L��\n"
+msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 
 #: g10/sig-check.c:275
-#, fuzzy, c-format
+#, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
-msgstr "���]���_ %08lX ���l�añ���ɦ]��Y�ӥ���������줸\n"
+msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
 #: g10/sig-check.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "���_ %08lX: �S���l�_�M�P�ʥ]�һݪ��l�_\n"
+msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
 #: g10/sig-check.c:558
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
+msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
 #: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "�L�k�b v3 �] PGP 2.x ���A�^��ñ������J�аO���\n"
+msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
 
 #: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_ñ������J�аO���\n"
+msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
 
 #: g10/sign.c:112
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "ĵ�i�G�аO %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:138
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�L�k�b v3 �] PGP 2.x ���A�^������J��h URL\n"
+msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
 
 #: g10/sign.c:146
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_����J��h URL\n"
+msgstr "無法在 v3 金鑰 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
 
 #: g10/sign.c:159
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
-msgstr "ĵ�i�G��h URL �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:187
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
-msgstr "ĵ�i�G��h URL �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "�ˬd�w�إߪ�ñ���ɵo�Ϳ��~�G %s\n"
+msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
 #: g10/sign.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s ñ���ӦۡG \"%s\"\n"
+msgstr "%s/%s 簽章來自: \"%s\"\n"
 
 #: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
+msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分離簽署\n"
 
 #: g10/sign.c:808
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
+msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
 #: g10/sign.c:900
 msgid "signing:"
-msgstr "ñ�p�G"
+msgstr "簽署:"
 
 #: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
+msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
 #: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
-msgstr "%s �[�K�N�Q�ĥ�\n"
+msgstr "%s 加密將被採用\n"
 
 #: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "���_���Q�Хܬ����w�� �w ��������Ӹ򰲪��H���Ʀr���;��֥ΡI\n"
+msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
 #: g10/skclist.c:157
-#, fuzzy, c-format
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "`%s' �w���L�G���ƤF\n"
+msgstr "已跳過 \"%s\": 重複了\n"
 
 #: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "`%s' �w���L�G %s\n"
+msgstr "已跳過 \"%s\": %s\n"
 
 #: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
-msgstr "�w���L�G�p�_�w�g�s�b\n"
+msgstr "已跳過: 私鑰已經存在\n"
 
 #: g10/skclist.c:185
-#, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr "`%s' �w���L�G�o�O�@��� PGP ���ͪ� ElGamal ���_�A�Ω�ñ���ä��w���I\n"
+msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "�H���O�� %lu �A���O %d: �g�J���ѡG %s\n"
+msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
 
 #: g10/tdbdump.c:104
 #, c-format
@@ -5152,348 +5123,341 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# �۹������H���ȲM��Q�إߩ� %s\n"
-"# �]�Х� \"gpg --import-ownertrust\" �Ө��^���̡^\n"
+"# 相對應的信任值清單被建立於 %s\n"
+"# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
 #: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "error in `%s': %s\n"
-msgstr "Ū�� `%s' �ɵo�Ϳ��~�G %s\n"
+msgstr "在 `%s' 中出錯: %s\n"
 
 #: g10/tdbdump.c:159
-#, fuzzy
 msgid "line too long"
-msgstr "�C�Ӫ�\n"
+msgstr "列太長"
 
 #: g10/tdbdump.c:167
 msgid "colon missing"
-msgstr ""
+msgstr "冒號缺漏"
 
 #: g10/tdbdump.c:173
-#, fuzzy
 msgid "invalid fingerprint"
-msgstr "���~�G�L�Ī�����\n"
+msgstr "無效的指紋"
 
 #: g10/tdbdump.c:178
-#, fuzzy
 msgid "ownertrust value missing"
-msgstr "�פJ�D�[�H����"
+msgstr "主觀信任值缺漏"
 
 #: g10/tdbdump.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "�M��H���O���ɿ��~�G %s\n"
+msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
 #: g10/tdbdump.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "Ū�����~�G %s\n"
+msgstr "讀取 `%s' 錯誤: `%s'\n"
 
 #: g10/tdbdump.c:227 g10/trustdb.c:380
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "�H����Ʈw�G�P�B�ƥ��ѡG %s\n"
+msgstr "信任資料庫: 同步化失敗: %s\n"
 
 #: g10/tdbio.c:128 g10/tdbio.c:1440
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "�H����Ʈw�O�� %lu: ���a�j�M���ѡG %s\n"
+msgstr "信任資料庫記錄 %lu: 本地搜尋失敗: %s\n"
 
 #: g10/tdbio.c:134 g10/tdbio.c:1447
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "�H����Ʈw�O�� %lu: �g�J���� (n=%d): %s\n"
+msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
-msgstr "�H����Ʈw��ʶq�L�j\n"
+msgstr "信任資料庫更動量過大\n"
 
 #: g10/tdbio.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "�L�k���� `%s' �G %s\n"
+msgstr "無法存取 `%s': %s\n"
 
 #: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
-msgstr "%s: �ؿ����s�b�I\n"
+msgstr "%s: 目錄不存在!\n"
 
 #: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
-#, fuzzy, c-format
+#, c-format
 msgid "can't create lock for `%s'\n"
-msgstr "�L�k�إ� `%s' �G %s\n"
+msgstr "無法為 `%s' 建立鎖定\n"
 
 #: g10/tdbio.c:524 g10/tdbio.c:591
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock `%s'\n"
-msgstr "�L�k�}�� `%s'\n"
+msgstr "無法鎖定 `%s'\n"
 
 #: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: �إߪ����O�����ѡG %s"
+msgstr "%s: 建立版本記錄失敗: %s"
 
 #: g10/tdbio.c:554
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: �إߤF�L�Ī��H����Ʈw\n"
+msgstr "%s: 建立了無效的信任資料庫\n"
 
 #: g10/tdbio.c:557
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: �إߤF�H����Ʈw\n"
+msgstr "%s: 建立了信任資料庫\n"
 
 #: g10/tdbio.c:597
 msgid "NOTE: trustdb not writable\n"
-msgstr "�Ъ`�N�G�H����Ʈw���i�g�J\n"
+msgstr "請注意: 信任資料庫不可寫入\n"
 
 #: g10/tdbio.c:614
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: �L�Ī��H����Ʈw\n"
+msgstr "%s: 無效的信任資料庫\n"
 
 #: g10/tdbio.c:646
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: �إ���������ѡG %s\n"
+msgstr "%s: 建立雜湊表失敗: %s\n"
 
 #: g10/tdbio.c:654
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: ��s�����O���ɿ��~�G %s\n"
+msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
 #: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
 #: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: Ū�������O���ɿ��~�G %s\n"
+msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
 #: g10/tdbio.c:730
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: �g�J�����O���ɿ��~�G %s\n"
+msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
 #: g10/tdbio.c:1169
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "�H����Ʈw�G���a�j�M���ѡG %s\n"
+msgstr "信任資料庫: 本地搜尋失敗: %s\n"
 
 #: g10/tdbio.c:1177
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "�H����Ʈw�GŪ������ (n=%d): %s\n"
+msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
 #: g10/tdbio.c:1198
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: ���O�@�ӫH����Ʈw�ɮ�\n"
+msgstr "%s: 不是一個信任資料庫檔案\n"
 
 #: g10/tdbio.c:1216
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: �O���s���� %lu �������O��\n"
+msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
 #: g10/tdbio.c:1221
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s: �L�Ī��ɮת��� %d\n"
+msgstr "%s: 無效的檔案版本 %d\n"
 
 #: g10/tdbio.c:1406
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: Ū���ۥѰO���ɿ��~�G %s\n"
+msgstr "%s: 讀取自由記錄時錯誤: %s\n"
 
 #: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: �g�J�ؿ��O���ɿ��~�G %s\n"
+msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
 #: g10/tdbio.c:1424
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: �O���k�s�ɥ��ѡG %s\n"
+msgstr "%s: 記錄歸零時失敗: %s\n"
 
 #: g10/tdbio.c:1454
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: ���[�Y���O���ɥ��ѡG %s\n"
+msgstr "%s: 附加某筆記錄時失敗: %s\n"
 
 #: g10/tdbio.c:1499
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "�H����Ʈw�l���F�F�а��� \"gpg --fix-trustdb\" �C\n"
+msgstr "信任資料庫損毀了; 請執行 \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "�L�k�B�z���� %d �r�Ū���r�C\n"
+msgstr "無法處理長於 %d 字符的文字列\n"
 
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "��J�C�� %d �r���٪�\n"
+msgstr "輸入列比 %d 字符還長\n"
 
 #: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "`%s' ���O�@�Ӧ��Ī��������_ ID\n"
+msgstr "`%s' 不是一個有效的長式金鑰 ID\n"
 
 #: g10/trustdb.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "���_ %08lX: �p���H�������_��Q�����F\n"
+msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 
 #: g10/trustdb.c:295
-#, fuzzy, c-format
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "���_ %08lX �b�H����Ʈw���X�{�F����@��\n"
+msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 
 #: g10/trustdb.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "���_ %08lX: ���H�������_�S�����_ �w �w���L\n"
+msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 ─ 已跳過\n"
 
 #: g10/trustdb.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "���_�w�Q�аO�������H���F�C\n"
+msgstr "金鑰 %s 已被標記成徹底信任了\n"
 
 #: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "�H���O�� %lu �A�ШD���O %d: Ū�����ѡG %s\n"
+msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 
 #: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "�H���O�� %lu ���O�ҽШD�����O %d\n"
+msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 
 #: g10/trustdb.c:446
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr ""
+msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
 #: g10/trustdb.c:452
 #, c-format
 msgid "using %s trust model\n"
-msgstr ""
+msgstr "正在使用 %s 信任模型\n"
 
 #: g10/trustdb.c:504
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-msgstr ""
+msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 
 #: g10/trustdb.c:506
-#, fuzzy
 msgid "[ revoked]"
-msgstr "[�w�M�P]"
+msgstr "[ 已撤銷 ]"
 
 #: g10/trustdb.c:508 g10/trustdb.c:513
-#, fuzzy
 msgid "[ expired]"
-msgstr "[�w�L��]"
+msgstr "[ 已過期 ]"
 
 #: g10/trustdb.c:512
-#, fuzzy
 msgid "[ unknown]"
-msgstr "����"
+msgstr "[  未知  ]"
 
 #: g10/trustdb.c:514
 msgid "[  undef ]"
-msgstr ""
+msgstr "[ 未定義 ]"
 
 #: g10/trustdb.c:515
 msgid "[marginal]"
-msgstr ""
+msgstr "[  勉強  ]"
 
 #: g10/trustdb.c:516
 msgid "[  full  ]"
-msgstr ""
+msgstr "[  完全  ]"
 
 #: g10/trustdb.c:517
 msgid "[ultimate]"
-msgstr ""
+msgstr "[  徹底  ]"
 
 #: g10/trustdb.c:532
 msgid "undefined"
-msgstr ""
+msgstr "未定義"
 
 #: g10/trustdb.c:533
-#, fuzzy
 msgid "never"
-msgstr "�û����L��"
+msgstr "永遠不"
 
 #: g10/trustdb.c:534
 msgid "marginal"
-msgstr ""
+msgstr "勉強"
 
 #: g10/trustdb.c:535
 msgid "full"
-msgstr ""
+msgstr "完全"
 
 #: g10/trustdb.c:536
 msgid "ultimate"
-msgstr ""
+msgstr "徹底"
 
 #: g10/trustdb.c:576
 msgid "no need for a trustdb check\n"
-msgstr "���ݭn�ˬd�H����Ʈw\n"
+msgstr "不需要檢查信任資料庫\n"
 
 #: g10/trustdb.c:582 g10/trustdb.c:2143
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "�U���H����Ʈw�ˬd�N�� %s �i��\n"
+msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
 #: g10/trustdb.c:591
-#, fuzzy, c-format
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "���ݭn�ˬd�H����Ʈw\n"
+msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
 #: g10/trustdb.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "���ݭn�ˬd�H����Ʈw\n"
+msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
 #: g10/trustdb.c:824 g10/trustdb.c:1262
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "���_ %08lX �S���Q���G %s\n"
+msgstr "找不到公鑰 %s: %s\n"
 
 #: g10/trustdb.c:1019
 msgid "please do a --check-trustdb\n"
-msgstr "��@�� --check-trustdb\n"
+msgstr "請做一次 --check-trustdb\n"
 
 #: g10/trustdb.c:1023
 msgid "checking the trustdb\n"
-msgstr "���b�ˬd�H����Ʈw\n"
+msgstr "正在檢查信任資料庫\n"
 
 #: g10/trustdb.c:1887
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr "�w�g�B�z�F %d ����_�]�@�p�w�ѨM�F %d �����ĩʡ^\n"
+msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
 #: g10/trustdb.c:1951
 msgid "no ultimately trusted keys found\n"
-msgstr "�S������������H�������_\n"
+msgstr "沒有找到任何徹底信任的金鑰\n"
 
 #: g10/trustdb.c:1965
-#, fuzzy, c-format
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "�����H�����_ %08lX �����_�S���Q���\n"
+msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
 #: g10/trustdb.c:1988
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-msgstr ""
+msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
 #: g10/trustdb.c:2074
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
-msgstr ""
+msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
 #: g10/trustdb.c:2149
-#, fuzzy, c-format
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "�H���O�� %lu �A���O %d: �g�J���ѡG %s\n"
+msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
 #: g10/verify.c:116
 msgid ""
@@ -5501,253 +5465,250 @@ msgid ""
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"ñ���L�k�Q���ҡC\n"
-"�аO��ñ���� (.sig �� .asc)\n"
-"���ӬO�Ĥ@�өR�O�C���w���ɮסC\n"
+"簽章無法被驗證.\n"
+"請記住簽章檔 (.sig 或 .asc)\n"
+"應該是第一個命令列給定的檔案.\n"
 
 #: g10/verify.c:189
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "��J�C %u �Ӫ��Ϊ̦C���� LF �򥢤F\n"
+msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
 #: util/errors.c:54
 msgid "general error"
-msgstr "�@��ʿ��~"
+msgstr "一般性錯誤"
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "�������ʥ]���A"
+msgstr "未知的封包型態"
 
 #: util/errors.c:56
 msgid "unknown version"
-msgstr "����������"
+msgstr "未知的版本"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "���������_�t��k"
+msgstr "未知的公鑰演算法"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "�������K�n�t��k"
+msgstr "未知的摘要演算法"
 
 #: util/errors.c:59
 msgid "bad public key"
-msgstr "�l�a�����_"
+msgstr "損壞的公鑰"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "�l�a���p�_"
+msgstr "損壞的私鑰"
 
 #: util/errors.c:61
 msgid "bad signature"
-msgstr "�l�a��ñ��"
+msgstr "損壞的簽章"
 
 #: util/errors.c:62
 msgid "checksum error"
-msgstr "�[�`�ˬd���~"
+msgstr "加總檢查錯誤"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "���~���K�X��"
+msgstr "錯誤的密語"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "�䤣�줽�_"
+msgstr "找不到公鑰"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "�������s�K�t��k"
+msgstr "未知的編密演算法"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
-msgstr "�S��k�}���_�Ͱ�"
+msgstr "沒辦法開啟鑰匙圈"
 
 #: util/errors.c:67
 msgid "invalid packet"
-msgstr "�L�Ī��ʥ]"
+msgstr "無效的封包"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "�L�Ī��ʸ�"
+msgstr "無效的封裝"
 
 #: util/errors.c:69
 msgid "no such user id"
-msgstr "�S���o�ӨϥΪ� ID"
+msgstr "沒有這個使用者 ID"
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "�L�k���Ψp�_"
+msgstr "無法取用私鑰"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "�ΤF���~���p�_"
+msgstr "用了錯誤的私鑰"
 
 #: util/errors.c:72
 msgid "not supported"
-msgstr "���Q�䴩"
+msgstr "未被支援"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "�l�a�����_"
+msgstr "損壞的金鑰"
 
 #: util/errors.c:74
 msgid "file read error"
-msgstr "�ɮ�Ū�����~"
+msgstr "檔案讀取錯誤"
 
 #: util/errors.c:75
 msgid "file write error"
-msgstr "�ɮ׼g�J���~"
+msgstr "檔案寫入錯誤"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "���������Y�t��k"
+msgstr "未知的壓縮演算法"
 
 #: util/errors.c:77
 msgid "file open error"
-msgstr "�ɮ׶}�ҿ��~"
+msgstr "檔案開啟錯誤"
 
 #: util/errors.c:78
 msgid "file create error"
-msgstr "�ɮ׫إ߿��~"
+msgstr "檔案建立錯誤"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "�L�Ī��K�X��"
+msgstr "無效的密語"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "���Q�ĥΪ����_�t��k"
+msgstr "未被採用的公鑰演算法"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "���Q�ĥΪ��s�K�t��k"
+msgstr "未被採用的編密演算法"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "�������h��"
+msgstr "未知的簽章層級"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "�H����Ʈw���~"
+msgstr "信任資料庫錯誤"
 
 #: util/errors.c:84
 msgid "bad MPI"
-msgstr "�l�a�� MPI"
+msgstr "損壞的 MPI"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "�귽����"
+msgstr "資源限制"
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "�L�Ī��_�Ͱ�"
+msgstr "無效的鑰匙圈"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "�l�a������"
+msgstr "損壞的憑證"
 
 #: util/errors.c:88
 msgid "malformed user id"
-msgstr "�Q�ܳy�L���ϥΪ� ID"
+msgstr "被變造過的使用者 ID"
 
 #: util/errors.c:89
 msgid "file close error"
-msgstr "�ɮ��������~"
+msgstr "檔案關閉錯誤"
 
 #: util/errors.c:90
 msgid "file rename error"
-msgstr "�ɮק�W���~"
+msgstr "檔案更名錯誤"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "�ɮקR�����~"
+msgstr "檔案刪除錯誤"
 
 #: util/errors.c:92
 msgid "unexpected data"
-msgstr "���w�������"
+msgstr "未預期的資料"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "�ɶ��W�L���٬�"
+msgstr "時間戳印有矛盾"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "�L�k�ϥΪ����_�t��k"
+msgstr "無法使用的公鑰演算法"
 
 #: util/errors.c:95
 msgid "file exists"
-msgstr "�ɮפw�s�b"
+msgstr "檔案已存在"
 
 #: util/errors.c:96
 msgid "weak key"
-msgstr "���_���z"
+msgstr "金鑰薄弱"
 
 #: util/errors.c:97
 msgid "invalid argument"
-msgstr "�L�Ī��Ѽ�"
+msgstr "無效的參數"
 
 #: util/errors.c:98
 msgid "bad URI"
-msgstr "�l�a�� URI"
+msgstr "損壞的 URI"
 
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "���Q�䴩�� URI"
+msgstr "未被支援的 URI"
 
 #: util/errors.c:100
 msgid "network error"
-msgstr "�������~"
+msgstr "網路錯誤"
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "���Q�[�K"
+msgstr "未被加密"
 
 #: util/errors.c:103
 msgid "not processed"
-msgstr "���Q�B�z"
+msgstr "未被處理"
 
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "���i�����_"
+msgstr "不可用的公鑰"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "���i���p�_"
+msgstr "不可用的私鑰"
 
 #: util/errors.c:107
 msgid "keyserver error"
-msgstr "���_���A�����~"
+msgstr "金鑰伺服器錯誤"
 
 #: util/errors.c:108
-#, fuzzy
 msgid "canceled"
-msgstr "����"
+msgstr "已取消"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no card"
-msgstr "���Q�[�K"
+msgstr "沒有卡片"
 
 #: util/logger.c:157
 msgid "ERROR: "
-msgstr ""
+msgstr "錯誤: "
 
 #: util/logger.c:160
 msgid "WARNING: "
-msgstr ""
+msgstr "警告: "
 
 #: util/logger.c:223
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... �o�O�ӷ岫 (%s:%d:%s)\n"
+msgstr "... 這是個瑕疵 (%s:%d:%s)\n"
 
 #: util/logger.c:229
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "�p���@�ӷ岫�F ... (%s:%d)\n"
+msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
 #: util/miscutil.c:307 util/miscutil.c:344
-#, fuzzy
 msgid "yes"
 msgstr "yes"
 
@@ -5773,697 +5734,56 @@ msgstr "qQ"
 
 #: util/miscutil.c:384
 msgid "okay|okay"
-msgstr ""
+msgstr "okay|ok|好"
 
 #: util/miscutil.c:386
 msgid "cancel|cancel"
-msgstr ""
+msgstr "cancel|取消"
 
 #: util/miscutil.c:387
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
 #: util/miscutil.c:388
-#, fuzzy
 msgid "cC"
-msgstr "c"
+msgstr "cC"
 
 #: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "ĵ�i�G���b�ϥΤ��w�����O����I\n"
+msgstr "警告: 正在使用不安全的記憶體!\n"
 
 #: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "�аѦ� http://www.gnupg.org/faq.html �W�i�@�B����T\n"
+msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
 #: util/secmem.c:343
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "�|���ҥΦw�����O����e�A���i��i��ާ@\n"
+msgstr "尚未啟用安全的記憶體前，不可能進行操作\n"
 
 #: util/secmem.c:344
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(�]�\�p����{���Ӱ��o��ƤF)\n"
-
-#~ msgid "--nrsign-key user-id"
-#~ msgstr "--nrsign-key �ϥΪ�ID"
-
-#~ msgid "--nrlsign-key user-id"
-#~ msgstr "--nrlsign-key �ϥΪ�ID"
-
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "�إߤ@��������ñ��"
-
-#~ msgid "sign the key non-revocably"
-#~ msgstr "�H���i�M�P�Ҧ�ñ�p���_"
-
-#~ msgid "sign the key locally and non-revocably"
-#~ msgstr "�H���i�M�P�Ҧ��b���añ�p���_"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "help"
-#~ msgstr "help"
-
-#~ msgid "list"
-#~ msgstr "list"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "debug"
-#~ msgstr "debug"
-
-#, fuzzy
-#~ msgid "name"
-#~ msgstr "enable"
-
-#, fuzzy
-#~ msgid "login"
-#~ msgstr "lsign"
-
-#, fuzzy
-#~ msgid "cafpr"
-#~ msgstr "fpr"
-
-#, fuzzy
-#~ msgid "forcesig"
-#~ msgstr "revsig"
-
-#, fuzzy
-#~ msgid "generate"
-#~ msgstr "�@��ʿ��~"
-
-#~ msgid "passwd"
-#~ msgstr "passwd"
-
-#~ msgid "save"
-#~ msgstr "save"
-
-#~ msgid "fpr"
-#~ msgstr "fpr"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "key"
-#~ msgstr "key"
-
-#~ msgid "check"
-#~ msgstr "check"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "sign"
-#~ msgstr "sign"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#, fuzzy
-#~ msgid "tsign"
-#~ msgstr "sign"
-
-#~ msgid "lsign"
-#~ msgstr "lsign"
-
-#~ msgid "nrsign"
-#~ msgstr "nrsign"
-
-#~ msgid "nrlsign"
-#~ msgstr "nrlsign"
-
-#~ msgid "adduid"
-#~ msgstr "adduid"
-
-#~ msgid "addphoto"
-#~ msgstr "addphoto"
-
-#~ msgid "deluid"
-#~ msgstr "deluid"
-
-#~ msgid "delphoto"
-#~ msgstr "delphoto"
-
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
-#, fuzzy
-#~ msgid "addcardkey"
-#~ msgstr "addkey"
-
-#~ msgid "delkey"
-#~ msgstr "delkey"
-
-#~ msgid "addrevoker"
-#~ msgstr "addrevoker"
+msgstr "(也許妳選錯程式來做這件事了)\n"
 
-#~ msgid "delsig"
-#~ msgstr "delsig"
+#~ msgid "select secondary key N"
+#~ msgstr "選擇次鑰 N"
 
-#~ msgid "expire"
-#~ msgstr "expire"
-
-#~ msgid "primary"
-#~ msgstr "primary"
-
-#~ msgid "toggle"
-#~ msgstr "toggle"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "pref"
-#~ msgstr "pref"
-
-#~ msgid "showpref"
-#~ msgstr "showpref"
-
-#~ msgid "setpref"
-#~ msgstr "setpref"
-
-#~ msgid "updpref"
-#~ msgstr "updpref"
-
-#, fuzzy
-#~ msgid "keyserver"
-#~ msgstr "���_���A�����~"
-
-#~ msgid "trust"
-#~ msgstr "trust"
-
-#~ msgid "revsig"
-#~ msgstr "revsig"
-
-#~ msgid "revuid"
-#~ msgstr "revuid"
-
-#~ msgid "revkey"
-#~ msgstr "revkey"
-
-#~ msgid "disable"
-#~ msgstr "disable"
-
-#~ msgid "enable"
-#~ msgstr "enable"
-
-#~ msgid "showphoto"
-#~ msgstr "showphoto"
-
-#~ msgid "digest algorithm `%s' is read-only in this release\n"
-#~ msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
-
-#~ msgid ""
-#~ "About to generate a new %s keypair.\n"
-#~ "              minimum keysize is  768 bits\n"
-#~ "              default keysize is 1024 bits\n"
-#~ "    highest suggested keysize is 2048 bits\n"
-#~ msgstr ""
-#~ "���󲣥ͤ@�Ʒs�� %s ���_��C\n"
-#~ "      �̰_�X�����_�ؤo�O  768 �줸\n"
-#~ "        �w�]�����_�ؤo�O 1024 �줸\n"
-#~ "    ��ij���̤j���_�ؤo�O 2048 �줸\n"
-
-#~ msgid "DSA only allows keysizes from 512 to 1024\n"
-#~ msgstr "DSA �����_�ؤo��श�� 512 �M 1024 ����\n"
-
-#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#~ msgstr "���_�ؤo�Ӥp�F RSA �����_�ؤo�̰_�X�����n�� 1024 �C\n"
-
-#~ msgid "keysize too small; 768 is smallest value allowed.\n"
-#~ msgstr "���_�ؤo�Ӥp�F�̰_�X�����n�� 768 �C\n"
-
-#~ msgid "keysize too large; %d is largest value allowed.\n"
-#~ msgstr "���_�ؤo�Ӥj�F�̤j�����Ψ� %d �C\n"
-
-#~ msgid ""
-#~ "Keysizes larger than 2048 are not suggested because\n"
-#~ "computations take REALLY long!\n"
-#~ msgstr ""
-#~ "����ij�ϥΤj�� 2048 �����_�ؤo�A\n"
-#~ "�]���p�� *�u��* �|��h�ܦh�ɶ��I\n"
-
-#, fuzzy
-#~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "�p�T�w�n�γo�Ӫ��_�ؤo�ܡH "
-
-#~ msgid ""
-#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
-#~ "very vulnerable to attacks!\n"
-#~ msgstr "�n�A���O�аO���p���ù��M��L�]�O�۷��e���Q�s�����z�I�I\n"
-
-#~ msgid "Experimental algorithms should not be used!\n"
-#~ msgstr "���Өϥι���ʪ��t��k�I\n"
-
-#~ msgid ""
-#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
-#~ msgstr "����ij�ϥγo�ӽs�K�t��k�F�д��Χ󥿦����I\n"
-
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "���b�g�� `%s'\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "��p�A�L�k�b�妸�Ҧ����o�˰�\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "�䤣�� `%s' ���_�G %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "�L�k�إ� `%s' �G %s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "�L�k�}���ɮסG %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "                ��Y \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = �Чi�D�ڧ�h�T��\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "���_ %08lX: ���_�w�g�Q�M�P�F�I\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "���_ %08lX: �l�_�w�g�Q�M�P�F�I\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: ���_�w�g�L���F\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: �ڭ� *��* �H���o����_\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (��ñ�p�Υ[�K)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (�ȯ�ñ�p��)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (��ñ�p�Υ[�K)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (�ȯ�[�K��)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (��ñ�p�Υ[�K)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: �L�k�}�ҡG %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: ĵ�i�G�o�O���ɮ�\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "�L�k�}�� %s: %s\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = �ګj�j�H��\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = �ڧ����H��\n"
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
-#~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
-#~ msgstr ""
-#~ "\"\n"
-#~ "�w�g�Q�p�����_ %08lX �b���añ�p�� %s\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   �� %08lX ñ�p�� %s%s\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: �L�k�s���G %s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: �L�k�إ���w\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: �L�k��w\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: �L�k�إߡG %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: �L�k�إߥؿ��G %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr "�p�G�p�L�צp��Q�n�ϥγo��Q�M�P�F�����_�A�Ц^�� \"yes\" �C"
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "�L�k�}�ҷӤ� \"%s\": %s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "�L�k�}���ɮסG %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "���~�G�_���ʺ|\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "���~�G�S���D�[�H����\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (�D�n���_ ID %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! �l�_�w�g�Q�M�P�F�G %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- �o�{�Q���y���M�P\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr " [���Ĵ����G %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr " [���Ĵ����G %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[�w�M�P]"
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "�L�k�إ� %s: %s\n"
-
-#~ msgid "|[files]|encrypt files"
-#~ msgstr "|[�ɮ�]|�[�K�ɮ�"
-
-#~ msgid "store only"
-#~ msgstr "���x�s"
-
-#~ msgid "|[files]|decrypt files"
-#~ msgstr "|[�ɮ�]|�ɮ׸ѱK"
-
-#~ msgid "sign a key non-revocably"
-#~ msgstr "�H���i�M�P�Ҧ���ñ�p�Y����_"
-
-#~ msgid "sign a key locally and non-revocably"
-#~ msgstr "�Ȧb���a�H���i�M�P�Ҧ���ñ�p�Y����_"
-
-#~ msgid "list only the sequence of packets"
-#~ msgstr "�ȦC�X�ʥ]�ǦC"
-
-#~ msgid "export the ownertrust values"
-#~ msgstr "�ץX�D�[�H����"
-
-#~ msgid "unattended trust database update"
-#~ msgstr "��s�����[���H����Ʈw"
-
-#~ msgid "fix a corrupted trust database"
-#~ msgstr "�״_�Y�Ӥw�l�����H����Ʈw"
-
-#~ msgid "De-Armor a file or stdin"
-#~ msgstr "�q�ɮשμзǿ�J�Ѷ}�ʸ�"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr "�q�ɮשμзǿ�J�i��ʸ�"
-
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|�W�r|�H�u�W�r�v�אּ�w�]�������"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "��w�]�����_���@�w�]�������"
-
-#~ msgid "don't use the terminal at all"
-#~ msgstr "�������n�ϥβ׺�"
-
-#~ msgid "force v3 signatures"
-#~ msgstr "�j���ϥβĤT��ñ��"
-
-#~ msgid "do not force v3 signatures"
-#~ msgstr "���n�j���ϥβĤT��ñ��"
-
-#~ msgid "force v4 key signatures"
-#~ msgstr "�j���ϥβĥ|�����_ñ��"
-
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "���n�j���ϥβĥ|�����_ñ��"
-
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "�`�O�� MDC �ӥ[�K"
-
-#~ msgid "never use a MDC for encryption"
-#~ msgstr "�û����n�� MDC �ӥ[�K"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "�ϥ� gpg-agent �N�z�{��"
-
-#~ msgid "batch mode: never ask"
-#~ msgstr "�妸�Ҧ��G�û����߰�"
-
-#~ msgid "assume yes on most questions"
-#~ msgstr "���]�j�h�ư��D���^�����u�O�v"
-
-#~ msgid "assume no on most questions"
-#~ msgstr "���]�j�h�ư��D���^�����u�_�v"
-
-#~ msgid "add this keyring to the list of keyrings"
-#~ msgstr "��o���_�Ͱ�[�i�_�Ͱ�M�椤"
-
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "��o�Өp�_�_�Ͱ�[�i�M�椤"
-
-#~ msgid "show which keyring a listed key is on"
-#~ msgstr "��ܳQ�C�X�����_�b���@���_�Ͱ�W"
-
-#~ msgid "|NAME|use NAME as default secret key"
-#~ msgstr "|�W�r|�ϥΡu�W�r�v���@�w�]�p�_"
-
-#~ msgid "|HOST|use this keyserver to lookup keys"
-#~ msgstr "|�D��|�ϥγo�Ӫ��_���A���ӴM����_"
-
-#~ msgid "|NAME|set terminal charset to NAME"
-#~ msgstr "|�W��|�]�w�׺ݦr�������u�W�١v"
-
-#~ msgid "read options from file"
-#~ msgstr "�q�ɮ�Ū���ﶵ"
-
-#~ msgid "|[file]|write status info to file"
-#~ msgstr "|[�ɮ�]|�⪬�A��T�g�J�ɮ�"
-
-#~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|���_ID|�����H�������_"
-
-#~ msgid "|FILE|load extension module FILE"
-#~ msgstr "|�ɮ�|���J�����Ҳ��ɮ�"
-
-#~ msgid "emulate the mode described in RFC1991"
-#~ msgstr "�ɶq�ҥ� RFC1991 �̩Ҵy�z���Ҧ�"
-
-#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 OpenPGP ���A"
-
-#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-#~ msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 PGP 2.x ���A"
-
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|�ϥμҦ� N ���K�X��"
-
-#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|�W��|�K�X��ϥΡu�W�١v�T���K�n�t��k"
-
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|�W��|�K�X��ϥΡu�W�١v�s�K�t��k"
-
-#~ msgid "|NAME|use cipher algorithm NAME"
-#~ msgstr "|�W��|�ϥΡu�W�١v�s�K�t��k"
-
-#~ msgid "|NAME|use message digest algorithm NAME"
-#~ msgstr "|�W��|�ϥΡu�W�١v�T���K�n�t��k"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr "|N|�ϥ� N ���Y�t��k"
-
-#~ msgid "throw keyid field of encrypted packets"
-#~ msgstr "�q�w�[�K���ʥ]�������_ ID �϶�"
-
-#~ msgid "Show Photo IDs"
-#~ msgstr "��ܷӤ� ID"
-
-#~ msgid "Don't show Photo IDs"
-#~ msgstr "����ܷӤ� ID"
-
-#~ msgid "Set command line to view Photo IDs"
-#~ msgstr "�]�w�[�ݷӤ� ID �ɭn�Ϊ��R�O�C"
-
-#, fuzzy
-#~ msgid "compress algorithm `%s' is read-only in this release\n"
-#~ msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
-
-#~ msgid "compress algorithm must be in range %d..%d\n"
-#~ msgstr "���Y�t��k�@�w�n���� %d �� %d ����\n"
-
-#~ msgid ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\n"
-#~ msgstr ""
-#~ "%08lX: �L�k�T�w�o����_�u���ݩ�o�ӫ�����\n"
-#~ "���O���_���³Q�����F\n"
-
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "���n�]�w %c%lu �L��\n"
-
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "���_ %08lX: ���O�@�� rfc2440 ���_ �w �w���L\n"
-
-#~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
-#~ msgstr "�`�N�G������ Elgamal �D�_ �w �פJ�o��D�_�i��|�ӤW�@�Ǯɶ�\n"
-
-#~ msgid " (default)"
-#~ msgstr " (�w�])"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX  �s�y��G %s �ϥδ����G %s"
-
-#~ msgid "Notation: "
-#~ msgstr "�аO�G "
-
-#~ msgid "Policy: "
-#~ msgstr "��h�G "
-
-#~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "�L�k�q���_���A�����o���_�G %s\n"
-
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "�ǰe�� `%s' ���ɭԵo�Ϳ��~�G %s\n"
-
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "���\�a�ǰe�� `%s' (���A=%u)\n"
-
-#~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "�ǰe�� `%s' ���ɭԥ��ѤF�G���A=%u\n"
-
-#~ msgid "can't search keyserver: %s\n"
-#~ msgstr "�L�k�j�M���_���A���G %s\n"
-
-#~ msgid ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\n"
-#~ msgstr ""
-#~ "���_ %08lX: �o�O�� PGP ���ͪ� ElGamal ���_�A�Ω�ñ���� *��* �w���I\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "���_ %08lX �O�b %lu ���᪺���ӻs�y�X�Ӫ� (�i��O�]���ɥ��Ȧ�ή�������"
-#~ "�D)\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "���_ %08lX �w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή�������"
-#~ "�D)\n"
-
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "���_ %08lX �Q�аO�������H��\n"
-
-#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr "���b�ˬd�`�� %d ñ�p=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-
-#~ msgid ""
-#~ "Select the algorithm to use.\n"
-#~ "\n"
-#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-#~ "for signatures.  This is the suggested algorithm because verification of\n"
-#~ "DSA signatures are much faster than those of ElGamal.\n"
-#~ "\n"
-#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-#~ "only\n"
-#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
-#~ "selected in a special way to create a safe key for signatures: this "
-#~ "program\n"
-#~ "does this but other OpenPGP implementations are not required to "
-#~ "understand\n"
-#~ "the signature+encryption flavor.\n"
-#~ "\n"
-#~ "The first (primary) key must always be a key which is capable of "
-#~ "signing;\n"
-#~ "this is the reason why the encryption only ElGamal key is not available "
-#~ "in\n"
-#~ "this menu."
-#~ msgstr ""
-#~ "��ܭn�ϥΪ��t��k�C\n"
-#~ "\n"
-#~ "DSA (��Y DSS) �O�@�ج��Ω�ñ�����Ʀ�ñ���t��k�C�o�O��ij�ϥΪ��t��k�A"
-#~ "�]���n���� DSA ñ������ ElGamal ñ���֤W�\�h�C\n"
-#~ "\n"
-#~ "ElGamal �O�@�إi�H�Ω�ñ���M�[�K���t��k�C\n"
-#~ "OpenPGP ��o�غt��k�Ϥ�����ؼ˦��G���[�K���A�M��ñ�p�Υ[�K���F\n"
-#~ "���L�̬O�@�˪��A���O�b���Q�Ω�ñ�����w�����_�e�A�������H�S������k\n"
-#~ "��ܤ@�ǯS�����ѼơG�o�ӵ{���o�ˤl���A����L�� OpenPGP ��@�ä��ݭn\n"
-#~ "�A��ñ���Υ[�K���˦��C\n"
-#~ "\n"
-#~ "�Ĥ@�� (�D�n��) ���_�����n���ñ�p����O�F�o�N�O������\n"
-#~ "�馳 ElGamal ���_�b�o�ӿ��̵L�k�ϥΡC"
-
-#~ msgid ""
-#~ "Although these keys are defined in RFC2440 they are not suggested\n"
-#~ "because they are not supported by all programs and signatures created\n"
-#~ "with them are quite large and very slow to verify."
-#~ msgstr ""
-#~ "���M�o�Ǫ��_�Q�w�q�b RFC2440 �̡A�����M����ij�ĥΥ��̡A\n"
-#~ "�]���L�̨ä��Q�Ҧ����{���Ҥ䴩�A�ӥB�ѥL�̩ҫإ߰_��ñ��\n"
-#~ "�Q���e�j�A���Ұ_�ӧ�O�w�C�C"
-
-#~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
-
-#~ msgid "key incomplete\n"
-#~ msgstr "���_������\n"
-
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "���_ %08lX ������\n"
-
-#, fuzzy
-#~ msgid "quit|quit"
-#~ msgstr "quit"
+#~ msgid "list signatures"
+#~ msgstr "列出簽章"
 
-#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (��ñ�p�Υ[�K)\n"
+#~ msgid "sign the key"
+#~ msgstr "簽署金鑰"
 
-#~ msgid ""
-#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
-#~ "able to use this key to communicate with PGP users.  This algorithm is "
-#~ "also\n"
-#~ "very slow, and may not be as secure as the other choices.\n"
-#~ msgstr ""
-#~ "�Ъ`�N�A�馳 GnuPG �פ䴩�o�Ӻt��k�C�γo�Ӻt��k�إߪ����_\n"
-#~ "�|�S����k�� PGP �ϥΪ̤��q�C�P�ɳo�Ӻt��k�D�`�a�w�C�A\n"
-#~ "�ӥB�i��]���p��L�t��k�ӱo�w���C\n"
+#~ msgid "delete signatures"
+#~ msgstr "刪除簽章"
 
-#~ msgid "Create anyway? "
-#~ msgstr "�L�צp���٬O�n�إ߶ܡH "
+#~ msgid "change the expire date"
+#~ msgstr "更改使用期限"
 
-#~ msgid "invalid symkey algorithm detected (%d)\n"
-#~ msgstr "������L�Ī��D��٩ʪ��_�t��k (%d)\n"
+#~ msgid "set preference list"
+#~ msgstr "設定偏好清單"
 
-#~ msgid "this keyserver is not fully HKP compatible\n"
-#~ msgstr "�o�Ӫ��_���A���ëD�����P HKP �ۮe\n"
+#~ msgid "updated preferences"
+#~ msgstr "更新過的偏好"
 
-#~ msgid "The use of this algorithm is deprecated - create anyway? "
-#~ msgstr "�o�Ӻt��k�ä��Q��ij�ϥ� �w �L�צp���٬O�~��ܡH "
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "索引 %d 沒有次鑰\n"